summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore33
-rw-r--r--.mailmap1
-rw-r--r--.travis.yml33
-rw-r--r--Documentation/Makefile6
-rw-r--r--Documentation/RelNotes/2.8.1.txt9
-rw-r--r--Documentation/RelNotes/2.8.2.txt70
-rw-r--r--Documentation/RelNotes/2.8.3.txt101
-rw-r--r--Documentation/RelNotes/2.8.4.txt69
-rw-r--r--Documentation/RelNotes/2.9.0.txt512
-rw-r--r--Documentation/SubmittingPatches80
-rw-r--r--Documentation/config.txt143
-rw-r--r--Documentation/diff-config.txt15
-rw-r--r--Documentation/diff-options.txt15
-rw-r--r--Documentation/everyday.txto2
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-clone.txt15
-rw-r--r--Documentation/git-commit-tree.txt4
-rw-r--r--Documentation/git-commit.txt3
-rw-r--r--Documentation/git-config.txt19
-rw-r--r--Documentation/git-fetch-pack.txt4
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-for-each-ref.txt4
-rw-r--r--Documentation/git-format-patch.txt60
-rw-r--r--Documentation/git-init.txt7
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-mailinfo.txt2
-rw-r--r--Documentation/git-merge.txt1
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-p4.txt11
-rw-r--r--Documentation/git-pack-objects.txt3
-rw-r--r--Documentation/git-pull.txt9
-rw-r--r--Documentation/git-rebase.txt6
-rw-r--r--Documentation/git-repack.txt8
-rw-r--r--Documentation/git-send-email.txt13
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-worktree.txt8
-rw-r--r--Documentation/git.txt11
-rw-r--r--Documentation/gitcredentials.txt5
-rw-r--r--Documentation/githooks.txt73
-rw-r--r--Documentation/glossary-content.txt2
-rwxr-xr-xDocumentation/lint-gitlink.perl71
-rw-r--r--Documentation/merge-options.txt15
-rw-r--r--Documentation/pretty-formats.txt4
-rw-r--r--Documentation/pretty-options.txt14
-rw-r--r--Documentation/technical/api-config.txt7
-rw-r--r--Documentation/technical/api-credentials.txt4
-rw-r--r--Documentation/technical/api-parse-options.txt15
-rw-r--r--Documentation/technical/api-trace.txt45
-rw-r--r--Documentation/technical/pack-protocol.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile77
-rw-r--r--README.md11
l---------RelNotes2
-rw-r--r--abspath.c5
-rw-r--r--archive-tar.c2
-rw-r--r--attr.c2
-rw-r--r--bisect.c7
-rw-r--r--branch.c37
-rw-r--r--branch.h9
-rw-r--r--builtin/am.c11
-rw-r--r--builtin/apply.c36
-rw-r--r--builtin/blame.c1
-rw-r--r--builtin/branch.c84
-rw-r--r--builtin/cat-file.c21
-rw-r--r--builtin/checkout.c5
-rw-r--r--builtin/clone.c26
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c28
-rw-r--r--builtin/config.c5
-rw-r--r--builtin/diff-files.c1
-rw-r--r--builtin/diff-index.c1
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/fetch-pack.c16
-rw-r--r--builtin/fetch.c6
-rw-r--r--builtin/fsck.c3
-rw-r--r--builtin/grep.c12
-rw-r--r--builtin/help.c8
-rw-r--r--builtin/index-pack.c39
-rw-r--r--builtin/init-db.c46
-rw-r--r--builtin/log.c185
-rw-r--r--builtin/mailsplit.c10
-rw-r--r--builtin/merge-file.c10
-rw-r--r--builtin/merge-tree.c18
-rw-r--r--builtin/merge.c35
-rw-r--r--builtin/mv.c21
-rw-r--r--builtin/name-rev.c19
-rw-r--r--builtin/notes.c13
-rw-r--r--builtin/pack-objects.c19
-rw-r--r--builtin/patch-id.c23
-rw-r--r--builtin/pull.c50
-rw-r--r--builtin/receive-pack.c55
-rw-r--r--builtin/reflog.c4
-rw-r--r--builtin/remote-ext.c2
-rw-r--r--builtin/remote.c2
-rw-r--r--builtin/replace.c1
-rw-r--r--builtin/rev-parse.c50
-rw-r--r--builtin/rm.c4
-rw-r--r--builtin/send-pack.c2
-rw-r--r--builtin/submodule--helper.c660
-rw-r--r--builtin/tag.c28
-rw-r--r--builtin/update-index.c2
-rw-r--r--builtin/upload-archive.c3
-rw-r--r--builtin/verify-tag.c61
-rw-r--r--builtin/worktree.c35
-rw-r--r--bundle.c23
-rw-r--r--cache-tree.c4
-rw-r--r--cache.h62
-rw-r--r--check-racy.c2
-rwxr-xr-xci/test-documentation.sh14
-rw-r--r--combine-diff.c3
-rw-r--r--commit.h1
-rw-r--r--compat/apple-common-crypto.h16
-rw-r--r--compat/mingw.c83
-rw-r--r--compat/mingw.h6
-rw-r--r--compat/precompose_utf8.c2
-rw-r--r--compat/snprintf.c2
-rw-r--r--compat/vcbuild/include/unistd.h4
-rw-r--r--compat/win32/pthread.h7
-rw-r--r--compat/win32/syslog.c6
-rw-r--r--compat/win32mmap.c31
-rw-r--r--compat/winansi.c58
-rw-r--r--config.c74
-rw-r--r--config.mak.uname4
-rw-r--r--configure.ac4
-rw-r--r--connected.c9
-rw-r--r--contrib/completion/git-completion.bash7
-rw-r--r--contrib/hooks/multimail/CHANGES43
-rw-r--r--contrib/hooks/multimail/CONTRIBUTING.rst17
-rw-r--r--contrib/hooks/multimail/README215
-rw-r--r--contrib/hooks/multimail/README.Git4
-rw-r--r--contrib/hooks/multimail/doc/customizing-emails.rst56
-rw-r--r--contrib/hooks/multimail/doc/troubleshooting.rst44
-rwxr-xr-xcontrib/hooks/multimail/git_multimail.py250
-rwxr-xr-xcontrib/hooks/multimail/post-receive.example6
-rw-r--r--convert.c19
-rw-r--r--copy.c6
-rw-r--r--credential-cache--daemon.c15
-rw-r--r--credential-cache.c1
-rw-r--r--credential.c9
-rw-r--r--diff-no-index.c3
-rw-r--r--diff.c16
-rw-r--r--diff.h1
-rw-r--r--diffcore-rename.c6
-rw-r--r--dir.c28
-rw-r--r--dir.h13
-rw-r--r--editor.c3
-rw-r--r--entry.c10
-rw-r--r--environment.c26
-rw-r--r--fast-import.c23
-rw-r--r--fetch-pack.c4
-rw-r--r--fsck.c26
-rwxr-xr-xgit-add--interactive.perl12
-rw-r--r--git-compat-util.h5
-rwxr-xr-xgit-cvsserver.perl6
-rwxr-xr-xgit-difftool--helper.sh4
-rwxr-xr-xgit-difftool.perl9
-rwxr-xr-xgit-merge-octopus.sh6
-rw-r--r--git-mergetool--lib.sh27
-rwxr-xr-xgit-mergetool.sh27
-rwxr-xr-xgit-p4.py34
-rw-r--r--git-parse-remote.sh46
-rw-r--r--git-rebase--interactive.sh9
-rw-r--r--git-rebase--merge.sh4
-rwxr-xr-xgit-rebase.sh12
-rwxr-xr-xgit-send-email.perl13
-rwxr-xr-xgit-stash.sh4
-rwxr-xr-xgit-submodule.sh317
-rw-r--r--git.c3
-rw-r--r--git.spec.in330
-rwxr-xr-xgitweb/gitweb.perl3
-rw-r--r--gpg-interface.c8
-rw-r--r--grep.c4
-rw-r--r--http-backend.c4
-rw-r--r--http-push.c14
-rw-r--r--http.c52
-rw-r--r--http.h1
-rw-r--r--ident.c24
-rw-r--r--imap-send.c32
-rw-r--r--list-objects.c6
-rw-r--r--ll-merge.c12
-rw-r--r--lockfile.c12
-rw-r--r--log-tree.c1
-rw-r--r--mailmap.c6
-rw-r--r--match-trees.c60
-rw-r--r--merge-recursive.c12
-rw-r--r--mergetools/examdiff18
-rw-r--r--mergetools/winmerge21
-rw-r--r--notes.c4
-rw-r--r--parse-options.c2
-rw-r--r--patch-ids.c2
-rw-r--r--patch-ids.h2
-rw-r--r--path.c65
-rw-r--r--perl/Git.pm2
-rw-r--r--perl/Git/SVN.pm3
-rw-r--r--po/bg.po4689
-rw-r--r--po/de.po3310
-rw-r--r--po/fr.po3262
-rw-r--r--po/git.pot3078
-rw-r--r--po/ko.po3192
-rw-r--r--po/pt_PT.po3893
-rw-r--r--po/ru.po3171
-rw-r--r--po/sv.po3269
-rw-r--r--po/vi.po3274
-rw-r--r--po/zh_CN.po3375
-rw-r--r--pretty.c90
-rw-r--r--quote.c13
-rw-r--r--quote.h3
-rw-r--r--reachable.c3
-rw-r--r--refs.c149
-rw-r--r--refs.h9
-rw-r--r--refs/files-backend.c442
-rw-r--r--refs/refs-internal.h15
-rw-r--r--remote-curl.c4
-rw-r--r--remote.c15
-rw-r--r--rerere.c659
-rw-r--r--rerere.h4
-rw-r--r--revision.c18
-rw-r--r--revision.h2
-rw-r--r--run-command.c42
-rw-r--r--run-command.h11
-rw-r--r--send-pack.c7
-rw-r--r--sequencer.c3
-rw-r--r--server-info.c2
-rw-r--r--setup.c158
-rw-r--r--sha1_file.c34
-rw-r--r--sha1_name.c12
-rw-r--r--split-index.c2
-rw-r--r--strbuf.c14
-rw-r--r--strbuf.h6
-rw-r--r--string-list.c8
-rw-r--r--submodule-config.c34
-rw-r--r--submodule-config.h2
-rw-r--r--submodule.c83
-rw-r--r--submodule.h26
-rw-r--r--t/README6
-rw-r--r--t/helper/.gitignore33
-rw-r--r--t/helper/test-chmtime.c (renamed from test-chmtime.c)0
-rw-r--r--t/helper/test-config.c (renamed from test-config.c)0
-rw-r--r--t/helper/test-ctype.c (renamed from test-ctype.c)0
-rw-r--r--t/helper/test-date.c (renamed from test-date.c)0
-rw-r--r--t/helper/test-delta.c (renamed from test-delta.c)0
-rw-r--r--t/helper/test-dump-cache-tree.c (renamed from test-dump-cache-tree.c)0
-rw-r--r--t/helper/test-dump-split-index.c (renamed from test-dump-split-index.c)0
-rw-r--r--t/helper/test-dump-untracked-cache.c (renamed from test-dump-untracked-cache.c)0
-rw-r--r--t/helper/test-fake-ssh.c (renamed from test-fake-ssh.c)0
-rw-r--r--t/helper/test-genrandom.c (renamed from test-genrandom.c)0
-rw-r--r--t/helper/test-hashmap.c (renamed from test-hashmap.c)0
-rw-r--r--t/helper/test-index-version.c (renamed from test-index-version.c)0
-rw-r--r--t/helper/test-line-buffer.c (renamed from test-line-buffer.c)0
-rw-r--r--t/helper/test-match-trees.c26
-rw-r--r--t/helper/test-mergesort.c (renamed from test-mergesort.c)0
-rw-r--r--t/helper/test-mktemp.c (renamed from test-mktemp.c)0
-rw-r--r--t/helper/test-parse-options.c (renamed from test-parse-options.c)107
-rw-r--r--t/helper/test-path-utils.c (renamed from test-path-utils.c)0
-rw-r--r--t/helper/test-prio-queue.c (renamed from test-prio-queue.c)0
-rw-r--r--t/helper/test-read-cache.c (renamed from test-read-cache.c)0
-rw-r--r--t/helper/test-regex.c (renamed from test-regex.c)0
-rw-r--r--t/helper/test-revision-walking.c (renamed from test-revision-walking.c)2
-rw-r--r--t/helper/test-run-command.c (renamed from test-run-command.c)0
-rw-r--r--t/helper/test-scrap-cache-tree.c (renamed from test-scrap-cache-tree.c)0
-rw-r--r--t/helper/test-sha1-array.c (renamed from test-sha1-array.c)0
-rw-r--r--t/helper/test-sha1.c (renamed from test-sha1.c)0
-rwxr-xr-xt/helper/test-sha1.sh (renamed from test-sha1.sh)4
-rw-r--r--t/helper/test-sigchain.c (renamed from test-sigchain.c)0
-rw-r--r--t/helper/test-string-list.c (renamed from test-string-list.c)0
-rw-r--r--t/helper/test-submodule-config.c (renamed from test-submodule-config.c)0
-rw-r--r--t/helper/test-subprocess.c (renamed from test-subprocess.c)0
-rw-r--r--t/helper/test-svn-fe.c (renamed from test-svn-fe.c)0
-rw-r--r--t/helper/test-urlmatch-normalization.c (renamed from test-urlmatch-normalization.c)0
-rw-r--r--t/helper/test-wildmatch.c (renamed from test-wildmatch.c)0
-rw-r--r--t/lib-git-p4.sh40
-rw-r--r--t/lib-git-svn.sh3
-rwxr-xr-xt/lib-gpg.sh5
-rw-r--r--t/lib-httpd/apache.conf17
-rwxr-xr-xt/perf/p3404-rebase-interactive.sh36
-rw-r--r--t/perf/perf-lib.sh24
-rwxr-xr-xt/t0000-basic.sh2
-rwxr-xr-xt/t0001-init.sh30
-rwxr-xr-xt/t0008-ignores.sh4
-rwxr-xr-xt/t0027-auto-crlf.sh301
-rwxr-xr-xt/t0040-parse-options.sh279
-rwxr-xr-xt/t0060-path-utils.sh46
-rwxr-xr-xt/t0300-credentials.sh11
-rwxr-xr-xt/t1020-subdirectory.sh10
-rwxr-xr-xt/t1300-repo-config.sh17
-rwxr-xr-xt/t1350-config-hooks-path.sh37
-rwxr-xr-xt/t1410-reflog.sh10
-rwxr-xr-xt/t1430-bad-ref-name.sh132
-rwxr-xr-xt/t1450-fsck.sh18
-rwxr-xr-xt/t1500-rev-parse.sh123
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh5
-rwxr-xr-xt/t1515-rev-parse-outside-repo.sh45
-rwxr-xr-xt/t2025-worktree-add.sh71
-rwxr-xr-xt/t2300-cd-to-toplevel.sh3
-rwxr-xr-xt/t3033-merge-toplevel.sh16
-rwxr-xr-xt/t3200-branch.sh29
-rwxr-xr-xt/t3203-branch-output.sh12
-rwxr-xr-xt/t3402-rebase-merge.sh9
-rwxr-xr-xt/t3404-rebase-interactive.sh28
-rwxr-xr-xt/t3412-rebase-root.sh2
-rwxr-xr-xt/t3419-rebase-patch-id.sh12
-rwxr-xr-xt/t3421-rebase-topology-linear.sh4
-rwxr-xr-xt/t3513-revert-submodule.sh4
-rwxr-xr-xt/t3910-mac-os-precompose.sh42
-rwxr-xr-xt/t4001-diff-rename.sh136
-rwxr-xr-xt/t4013-diff-various.sh2
-rwxr-xr-xt/t4014-format-patch.sh111
-rwxr-xr-xt/t4047-diff-dirstat.sh3
-rwxr-xr-xt/t4151-am-abort.sh2
-rwxr-xr-xt/t4200-rerere.sh170
-rwxr-xr-xt/t4201-shortlog.sh2
-rwxr-xr-xt/t4202-log.sh8
-rwxr-xr-xt/t4204-patch-id.sh6
-rwxr-xr-xt/t4213-log-tabexpand.sh105
-rwxr-xr-xt/t5300-pack-object.sh6
-rwxr-xr-xt/t5400-send-pack.sh12
-rwxr-xr-xt/t5500-fetch-pack.sh21
-rwxr-xr-xt/t5504-fetch-receive-strict.sh10
-rwxr-xr-xt/t5510-fetch.sh1
-rwxr-xr-xt/t5520-pull.sh74
-rwxr-xr-xt/t5521-pull-options.sh21
-rwxr-xr-xt/t5526-fetch-submodules.sh14
-rwxr-xr-xt/t5532-fetch-proxy.sh21
-rwxr-xr-xt/t5550-http-fetch-dumb.sh49
-rwxr-xr-xt/t5551-http-fetch-smart.sh17
-rwxr-xr-xt/t5601-clone.sh4
-rwxr-xr-xt/t5604-clone-reference.sh (renamed from t/t5700-clone-reference.sh)0
-rwxr-xr-xt/t5605-clone-local.sh (renamed from t/t5701-clone-local.sh)0
-rwxr-xr-xt/t5606-clone-options.sh (renamed from t/t5702-clone-options.sh)0
-rwxr-xr-xt/t5607-clone-bundle.sh (renamed from t/t5704-bundle.sh)0
-rwxr-xr-xt/t5608-clone-2gb.sh (renamed from t/t5705-clone-2gb.sh)0
-rwxr-xr-xt/t5609-clone-branch.sh (renamed from t/t5706-clone-branch.sh)0
-rwxr-xr-xt/t5610-clone-detached.sh (renamed from t/t5707-clone-detached.sh)0
-rwxr-xr-xt/t5611-clone-config.sh (renamed from t/t5708-clone-config.sh)20
-rwxr-xr-xt/t5612-clone-refspec.sh (renamed from t/t5709-clone-refspec.sh)0
-rwxr-xr-xt/t5613-info-alternate.sh (renamed from t/t5710-info-alternate.sh)0
-rwxr-xr-xt/t5614-clone-submodules.sh85
-rwxr-xr-xt/t6009-rev-list-parent.sh4
-rwxr-xr-xt/t6010-merge-base.sh6
-rwxr-xr-xt/t6012-rev-list-simplify.sh2
-rwxr-xr-xt/t6024-recursive-merge.sh2
-rwxr-xr-xt/t6026-merge-attr.sh3
-rwxr-xr-xt/t6029-merge-subtree.sh2
-rwxr-xr-xt/t6036-recursive-corner-cases.sh86
-rwxr-xr-xt/t6041-bisect-submodule.sh4
-rwxr-xr-xt/t6044-merge-unrelated-index-changes.sh153
-rwxr-xr-xt/t6101-rev-parse-parents.sh2
-rwxr-xr-xt/t6302-for-each-ref-filter.sh72
-rwxr-xr-xt/t7001-mv.sh16
-rwxr-xr-xt/t7004-tag.sh41
-rwxr-xr-xt/t7030-verify-tag.sh13
-rwxr-xr-xt/t7300-clean.sh2
-rwxr-xr-xt/t7400-submodule-basic.sh87
-rwxr-xr-xt/t7403-submodule-sync.sh4
-rwxr-xr-xt/t7406-submodule-update.sh121
-rwxr-xr-xt/t7407-submodule-foreach.sh49
-rwxr-xr-xt/t7501-commit.sh40
-rwxr-xr-xt/t7502-commit.sh5
-rwxr-xr-xt/t7507-commit-verbose.sh72
-rwxr-xr-xt/t7510-signed-commit.sh13
-rwxr-xr-xt/t7600-merge.sh38
-rwxr-xr-xt/t7605-merge-resolve.sh6
-rwxr-xr-xt/t7609-merge-co-error-msgs.sh18
-rwxr-xr-xt/t7610-mergetool.sh64
-rwxr-xr-xt/t7800-difftool.sh25
-rwxr-xr-xt/t7810-grep.sh27
-rwxr-xr-xt/t8003-blame-corner-cases.sh14
-rwxr-xr-xt/t9100-git-svn-basic.sh66
-rwxr-xr-xt/t9101-git-svn-props.sh12
-rwxr-xr-xt/t9102-git-svn-deep-rmdir.sh2
-rwxr-xr-xt/t9103-git-svn-tracked-directory-removed.sh22
-rwxr-xr-xt/t9106-git-svn-commit-diff-clobber.sh6
-rwxr-xr-xt/t9107-git-svn-migrate.sh61
-rwxr-xr-xt/t9110-git-svn-use-svm-props.sh18
-rwxr-xr-xt/t9111-git-svn-use-svnsync-props.sh18
-rwxr-xr-xt/t9120-git-svn-clone-with-percent-escapes.sh6
-rwxr-xr-xt/t9123-git-svn-rebuild-with-rewriteroot.sh2
-rwxr-xr-xt/t9153-git-svn-rewrite-uuid.sh4
-rwxr-xr-xt/t9300-fast-import.sh19
-rwxr-xr-xt/t9400-git-cvsserver-server.sh3
-rwxr-xr-xt/t9802-git-p4-filetype.sh6
-rwxr-xr-xt/t9824-git-p4-git-lfs.sh6
-rwxr-xr-xt/t9826-git-p4-keep-empty-commits.sh60
-rwxr-xr-xt/t9828-git-p4-map-user.sh61
-rwxr-xr-xt/t9829-git-p4-jobs.sh99
-rwxr-xr-xt/t9903-bash-prompt.sh2
-rw-r--r--t/test-lib-functions.sh50
-rw-r--r--t/test-lib.sh27
-rw-r--r--tag.c53
-rw-r--r--tag.h2
-rw-r--r--test-match-trees.c24
-rw-r--r--transport-helper.c8
-rw-r--r--tree-diff.c8
-rw-r--r--tree-walk.c16
-rw-r--r--tree-walk.h8
-rw-r--r--tree.c10
-rw-r--r--unpack-trees.c84
-rw-r--r--upload-pack.c28
-rw-r--r--usage.c48
-rw-r--r--utf8.h2
-rw-r--r--vcs-svn/line_buffer.c4
-rw-r--r--vcs-svn/sliding_window.c2
-rw-r--r--vcs-svn/svndiff.c4
-rw-r--r--vcs-svn/svndump.c4
-rw-r--r--walker.c4
-rw-r--r--wildmatch.c2
-rw-r--r--worktree.c124
-rw-r--r--worktree.h28
-rw-r--r--wrap-for-bin.sh1
-rw-r--r--wrapper.c21
-rw-r--r--wt-status.c68
-rw-r--r--wt-status.h6
-rw-r--r--xdiff/xdiff.h2
-rw-r--r--xdiff/xdiffi.c40
-rw-r--r--xdiff/xprepare.c3
418 files changed, 28426 insertions, 18514 deletions
diff --git a/.gitignore b/.gitignore
index 5087ce1..05cb58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,39 +179,6 @@
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
/gitweb/static/gitweb.min.*
-/test-chmtime
-/test-ctype
-/test-config
-/test-date
-/test-delta
-/test-dump-cache-tree
-/test-dump-split-index
-/test-dump-untracked-cache
-/test-fake-ssh
-/test-scrap-cache-tree
-/test-genrandom
-/test-hashmap
-/test-index-version
-/test-line-buffer
-/test-match-trees
-/test-mergesort
-/test-mktemp
-/test-parse-options
-/test-path-utils
-/test-prio-queue
-/test-read-cache
-/test-regex
-/test-revision-walking
-/test-run-command
-/test-sha1
-/test-sha1-array
-/test-sigchain
-/test-string-list
-/test-submodule-config
-/test-subprocess
-/test-svn-fe
-/test-urlmatch-normalization
-/test-wildmatch
/common-cmds.h
*.tar.gz
*.dsc
diff --git a/.mailmap b/.mailmap
index e5b4126..a9162c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,6 +51,7 @@ Dirk Süsserott <newsletter@dirk.my1.cc>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
Eric S. Raymond <esr@thyrsus.com>
+Eric Wong <e@80x24.org> <normalperson@yhbt.net>
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
diff --git a/.travis.yml b/.travis.yml
index 78e433b..c20ec54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,16 @@ addons:
apt:
packages:
- language-pack-is
+ - git-svn
env:
global:
- DEVELOPER=1
- - P4_VERSION="15.2"
- - GIT_LFS_VERSION="1.1.0"
+ # The Linux build installs the defined dependency versions below.
+ # The OS X build installs the latest available versions. Keep that
+ # in mind when you encounter a broken OS X build!
+ - LINUX_P4_VERSION="16.1"
+ - LINUX_GIT_LFS_VERSION="1.2.0"
- DEFAULT_TEST_TARGET=prove
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- GIT_TEST_OPTS="--verbose --tee"
@@ -32,23 +36,38 @@ env:
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
- GIT_SKIP_TESTS="t9810 t9816"
+matrix:
+ include:
+ - env: Documentation
+ os: linux
+ compiler: clang
+ addons:
+ apt:
+ packages:
+ - asciidoc
+ - xmlto
+ before_install:
+ before_script:
+ script: ci/test-documentation.sh
+ after_failure:
+
before_install:
- >
case "${TRAVIS_OS_NAME:-linux}" in
linux)
mkdir --parents custom/p4
pushd custom/p4
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4d
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
chmod u+x p4d
chmod u+x p4
export PATH="$(pwd):$PATH"
popd
mkdir --parents custom/git-lfs
pushd custom/git-lfs
- wget --quiet https://github.com/github/git-lfs/releases/download/v$GIT_LFS_VERSION/git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz
- tar --extract --gunzip --file "git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz"
- cp git-lfs-$GIT_LFS_VERSION/git-lfs .
+ wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
+ tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+ cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
export PATH="$(pwd):$PATH"
popd
;;
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3e39e28..35c1385 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -146,7 +146,7 @@ else
ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
endif
endif
-ifdef MAN_BOLD_LITERAL
+ifndef NO_MAN_BOLD_LITERAL
XMLTO_EXTRA += -m manpage-bold-literal.xsl
endif
ifdef DOCBOOK_SUPPRESS_SP
@@ -204,6 +204,7 @@ ifndef V
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
QUIET_GEN = @echo ' ' GEN $@;
+ QUIET_LINT = @echo ' ' LINT $@;
QUIET_STDERR = 2> /dev/null
QUIET_SUBDIR0 = +@subdir=
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
@@ -427,4 +428,7 @@ quick-install-html: require-htmlrepo
print-man1:
@for i in $(MAN1_TXT); do echo $$i; done
+lint-docs::
+ $(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl
+
.PHONY: FORCE
diff --git a/Documentation/RelNotes/2.8.1.txt b/Documentation/RelNotes/2.8.1.txt
new file mode 100644
index 0000000..ef6d80b
--- /dev/null
+++ b/Documentation/RelNotes/2.8.1.txt
@@ -0,0 +1,9 @@
+Git v2.8.1 Release Notes
+========================
+
+Fixes since v2.8
+----------------
+
+ * "make rpmbuild" target was broken as its input, git.spec.in, was
+ not updated to match a file it describes that has been renamed
+ recently. This has been fixed.
diff --git a/Documentation/RelNotes/2.8.2.txt b/Documentation/RelNotes/2.8.2.txt
new file mode 100644
index 0000000..447b193
--- /dev/null
+++ b/Documentation/RelNotes/2.8.2.txt
@@ -0,0 +1,70 @@
+Git v2.8.2 Release Notes
+========================
+
+Fixes since v2.8.1
+------------------
+
+ * The embedded args argv-array in the child process is used to build
+ the command line to run pack-objects instead of using a separate
+ array of strings.
+
+ * Bunch of tests on "git clone" has been renumbered for better
+ organization.
+
+ * The tests that involve running httpd leaked the system-wide
+ configuration in /etc/gitconfig to the tested environment.
+
+ * "index-pack --keep=<msg>" was broken since v2.1.0 timeframe.
+
+ * "git config --get-urlmatch", unlike other variants of the "git
+ config --get" family, did not signal error with its exit status
+ when there was no matching configuration.
+
+ * The "--local-env-vars" and "--resolve-git-dir" options of "git
+ rev-parse" failed to work outside a repository when the command's
+ option parsing was rewritten in 1.8.5 era.
+
+ * Fetching of history by naming a commit object name directly didn't
+ work across remote-curl transport.
+
+ * A small memory leak in an error codepath has been plugged in xdiff
+ code.
+
+ * strbuf_getwholeline() did not NUL-terminate the buffer on certain
+ corner cases in its error codepath.
+
+ * The startup_info data, which records if we are working inside a
+ repository (among other things), are now uniformly available to Git
+ subcommand implementations, and Git avoids attempting to touch
+ references when we are not in a repository.
+
+ * "git mergetool" did not work well with conflicts that both sides
+ deleted.
+
+ * "git send-email" had trouble parsing alias file in mailrc format
+ when lines in it had trailing whitespaces on them.
+
+ * When "git merge --squash" stopped due to conflict, the concluding
+ "git commit" failed to read in the SQUASH_MSG that shows the log
+ messages from all the squashed commits.
+
+ * "git merge FETCH_HEAD" dereferenced NULL pointer when merging
+ nothing into an unborn history (which is arguably unusual usage,
+ which perhaps was the reason why nobody noticed it).
+
+ * Build updates for MSVC.
+
+ * "git diff -M" used to work better when two originally identical
+ files A and B got renamed to X/A and X/B by pairing A to X/A and B
+ to X/B, but this was broken in the 2.0 timeframe.
+
+ * "git send-pack --all <there>" was broken when its command line
+ option parsing was written in the 2.6 timeframe.
+
+ * When running "git blame $path" with unnormalized data in the index
+ for the path, the data in the working tree was blamed, even though
+ "git add" would not have changed what is already in the index, due
+ to "safe crlf" that disables the line-end conversion. It has been
+ corrected.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.8.3.txt b/Documentation/RelNotes/2.8.3.txt
new file mode 100644
index 0000000..fedd996
--- /dev/null
+++ b/Documentation/RelNotes/2.8.3.txt
@@ -0,0 +1,101 @@
+Git v2.8.3 Release Notes
+========================
+
+Fixes since v2.8.2
+------------------
+
+ * "git send-email" now uses a more readable timestamps when
+ formulating a message ID.
+
+ * The repository set-up sequence has been streamlined (the biggest
+ change is that there is no longer git_config_early()), so that we
+ do not attempt to look into refs/* when we know we do not have a
+ Git repository.
+
+ * When "git worktree" feature is in use, "git branch -d" allowed
+ deletion of a branch that is checked out in another worktree
+
+ * When "git worktree" feature is in use, "git branch -m" renamed a
+ branch that is checked out in another worktree without adjusting
+ the HEAD symbolic ref for the worktree.
+
+ * "git format-patch --help" showed `-s` and `--no-patch` as if these
+ are valid options to the command. We already hide `--patch` option
+ from the documentation, because format-patch is about showing the
+ diff, and the documentation now hides these options as well.
+
+ * A change back in version 2.7 to "git branch" broke display of a
+ symbolic ref in a non-standard place in the refs/ hierarchy (we
+ expect symbolic refs to appear in refs/remotes/*/HEAD to point at
+ the primary branch the remote has, and as .git/HEAD to point at the
+ branch we locally checked out).
+
+ * A partial rewrite of "git submodule" in the 2.7 timeframe changed
+ the way the gitdir: pointer in the submodules point at the real
+ repository location to use absolute paths by accident. This has
+ been corrected.
+
+ * "git commit" misbehaved in a few minor ways when an empty message
+ is given via -m '', all of which has been corrected.
+
+ * Support for CRAM-MD5 authentication method in "git imap-send" did
+ not work well.
+
+ * The socks5:// proxy support added back in 2.6.4 days was not aware
+ that socks5h:// proxies behave differently.
+
+ * "git config" had a codepath that tried to pass a NULL to
+ printf("%s"), which nobody seems to have noticed.
+
+ * On Cygwin, object creation uses the "create a temporary and then
+ rename it to the final name" pattern, not "create a temporary,
+ hardlink it to the final name and then unlink the temporary"
+ pattern.
+
+ 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.
+
+ * "git replace -e" did not honour "core.editor" configuration.
+
+ * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
+ we use in imap-send, which has been adjusted for the change.
+
+ * "git submodule" reports the paths of submodules the command
+ recurses into, but this was incorrect when the command was not run
+ from the root level of the superproject.
+
+ * The test scripts for "git p4" (but not "git p4" implementation
+ itself) has been updated so that they would work even on a system
+ where the installed version of Python is python 3.
+
+ * The "user.useConfigOnly" configuration variable makes it an error
+ if users do not explicitly set user.name and user.email. However,
+ its check was not done early enough and allowed another error to
+ trigger, reporting that the default value we guessed from the
+ system setting was unusable. This was a suboptimal end-user
+ experience as we want the users to set user.name/user.email without
+ relying on the auto-detection at all.
+
+ * "git mv old new" did not adjust the path for a submodule that lives
+ as a subdirectory inside old/ directory correctly.
+
+ * "git push" from a corrupt repository that attempts to push a large
+ number of refs deadlocked; the thread to relay rejection notices
+ for these ref updates blocked on writing them to the main thread,
+ after the main thread at the receiving end notices that the push
+ failed and decides not to read these notices and return a failure.
+
+ * A question by "git send-email" to ask the identity of the sender
+ has been updated.
+
+ * Recent update to Git LFS broke "git p4" by changing the output from
+ its "lfs pointer" subcommand.
+
+ * Some multi-byte encoding can have a backslash byte as a later part
+ of one letter, which would confuse "highlight" filter used in
+ gitweb.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.8.4.txt b/Documentation/RelNotes/2.8.4.txt
new file mode 100644
index 0000000..f4e2552
--- /dev/null
+++ b/Documentation/RelNotes/2.8.4.txt
@@ -0,0 +1,69 @@
+Git v2.8.4 Release Notes
+========================
+
+Fixes since v2.8.3
+------------------
+
+ * Documentation for "git merge --verify-signatures" has been updated
+ to clarify that the signature of only the commit at the tip is
+ verified. Also the phrasing used for signature and key validity is
+ adjusted to align with that used by OpenPGP.
+
+ * On Windows, .git and optionally any files whose name starts with a
+ dot are now marked as hidden, with a core.hideDotFiles knob to
+ customize this behaviour.
+
+ * Portability enhancement for "rebase -i" to help platforms whose
+ shell does not like "for i in <empty>" (which is not POSIX-kosher).
+
+ * "git fsck" learned to catch NUL byte in a commit object as
+ potential error and warn.
+
+ * CI test was taught to build documentation pages.
+
+ * Many 'linkgit:<git documentation page>' references were broken,
+ which are all fixed with this.
+
+ * "git describe --contains" often made a hard-to-justify choice of
+ tag to give name to a given commit, because it tried to come up
+ with a name with smallest number of hops from a tag, causing an old
+ commit whose close descendant that is recently tagged were not
+ described with respect to an old tag but with a newer tag. It did
+ not help that its computation of "hop" count was further tweaked to
+ penalize being on a side branch of a merge. The logic has been
+ updated to favor using the tag with the oldest tagger date, which
+ is a lot easier to explain to the end users: "We describe a commit
+ in terms of the (chronologically) oldest tag that contains the
+ commit."
+
+ * Running tests with '-x' option to trace the individual command
+ executions is a useful way to debug test scripts, but some tests
+ that capture the standard error stream and check what the command
+ said can be broken with the trace output mixed in. When running
+ our tests under "bash", however, we can redirect the trace output
+ to another file descriptor to keep the standard error of programs
+ being tested intact.
+
+ * "http.cookieFile" configuration variable clearly wants a pathname,
+ but we forgot to treat it as such by e.g. applying tilde expansion.
+
+ * When de-initialising all submodules, "git submodule deinit" gave a
+ faulty recommendation to use "git submodule deinit .", which would
+ result in a strange error message in a pathological corner case.
+ This has been corrected to suggest "submodule deinit --all" instead.
+
+ * Many commands normalize command line arguments from NFD to NFC
+ variant of UTF-8 on OSX, but commands in the "diff" family did
+ not, causing "git diff $path" to complain that no such path is
+ known to Git. They have been taught to do the normalization.
+
+ * A couple of bugs around core.autocrlf have been fixed.
+
+ * "git difftool" learned to handle unmerged paths correctly in
+ dir-diff mode.
+
+ * The "are we talking with TTY, doing an interactive session?"
+ detection has been updated to work better for "Git for Windows".
+
+
+Also contains other minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
new file mode 100644
index 0000000..b61d367
--- /dev/null
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -0,0 +1,512 @@
+Git 2.9 Release Notes
+=====================
+
+Backward compatibility notes
+----------------------------
+
+The end-user facing Porcelain level commands in the "git diff" and
+"git log" family by default enable the rename detection; you can still
+use "diff.renames" configuration variable to disable this.
+
+Merging two branches that have no common ancestor with "git merge" is
+by default forbidden now to prevent creating such an unusual merge by
+mistake.
+
+The output formats of "git log" that indents the commit log message by
+4 spaces now expands HT in the log message by default. You can use
+the "--no-expand-tabs" option to disable this.
+
+"git commit-tree" plumbing command required the user to always sign
+its result when the user sets the commit.gpgsign configuration
+variable, which was an ancient mistake, which this release corrects.
+A script that drives commit-tree, if it relies on this mistake, now
+needs to read commit.gpgsign and pass the -S option as necessary.
+
+
+Updates since v2.8
+------------------
+
+UI, Workflows & Features
+
+ * Comes with git-multimail 1.3.1 (in contrib/).
+
+ * The end-user facing commands like "git diff" and "git log"
+ now enable the rename detection by default.
+
+ * The credential.helper configuration variable is cumulative and
+ there is no good way to override it from the command line. As
+ a special case, giving an empty string as its value now serves
+ as the signal to clear the values specified in various files.
+
+ * A new "interactive.diffFilter" configuration can be used to
+ customize the diff shown in "git add -i" sessions.
+
+ * "git p4" now allows P4 author names to be mapped to Git author
+ names.
+
+ * "git rebase -x" can be used without passing "-i" option.
+
+ * "git -c credential.<var>=<value> submodule" can now be used to
+ propagate configuration variables related to credential helper
+ down to the submodules.
+
+ * "git tag" can create an annotated tag without explicitly given an
+ "-a" (or "-s") option (i.e. when a tag message is given). A new
+ configuration variable, tag.forceSignAnnotated, can be used to tell
+ the command to create signed tag in such a situation.
+
+ * "git merge" used to allow merging two branches that have no common
+ base by default, which led to a brand new history of an existing
+ project created and then get pulled by an unsuspecting maintainer,
+ which allowed an unnecessary parallel history merged into the
+ existing project. The command has been taught not to allow this by
+ default, with an escape hatch "--allow-unrelated-histories" option
+ to be used in a rare event that merges histories of two projects
+ that started their lives independently.
+
+ * "git pull" has been taught to pass the "--allow-unrelated-histories"
+ option to underlying "git merge".
+
+ * "git apply -v" learned to report paths in the patch that were
+ skipped via --include/--exclude mechanism or being outside the
+ current working directory.
+
+ * Shell completion (in contrib/) updates.
+
+ * The commit object name reported when "rebase -i" stops has been
+ shortened.
+
+ * "git worktree add" can be given "--no-checkout" option to only
+ create an empty worktree without checking out the files.
+
+ * "git mergetools" learned to drive ExamDiff.
+
+ * "git pull --rebase" learned "--[no-]autostash" option, so that
+ the rebase.autostash configuration variable set to true can be
+ overridden from the command line.
+
+ * When "git log" shows the log message indented by 4-spaces, the
+ remainder of a line after a HT does not align in the way the author
+ originally intended. The command now expands tabs by default to help
+ such a case, and allows the users to override it with a new option,
+ "--no-expand-tabs".
+
+ * "git send-email" now uses a more readable timestamps when
+ formulating a message ID.
+
+ * "git rerere" can encounter two or more files with the same conflict
+ signature that have to be resolved in different ways, but there was
+ no way to record these separate resolutions.
+
+ * "git p4" learned to record P4 jobs in Git commit that imports from
+ the history in Perforce.
+
+ * "git describe --contains" often made a hard-to-justify choice of
+ tag to name a given commit, because it tried to come up
+ with a name with smallest number of hops from a tag, causing an old
+ commit whose close descendant that is recently tagged were not
+ described with respect to an old tag but with a newer tag. It did
+ not help that its computation of "hop" count was further tweaked to
+ penalize being on a side branch of a merge. The logic has been
+ updated to favor using the tag with the oldest tagger date, which
+ is a lot easier to explain to the end users: "We describe a commit
+ in terms of the (chronologically) oldest tag that contains the
+ commit."
+
+ * "git clone" learned the "--shallow-submodules" option.
+
+ * HTTP transport clients learned to throw extra HTTP headers at the
+ server, specified via http.extraHeader configuration variable.
+
+ * The "--compaction-heuristic" option to "git diff" family of
+ commands enables a heuristic to make the patch output more readable
+ by using a blank line as a strong hint that the contents before and
+ after it belong to logically separate units. It is still
+ experimental.
+
+ * A new configuration variable core.hooksPath allows customizing
+ where the hook directory is.
+
+ * An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
+ submodule honor -c credential.* from command line, 2016-02-29)
+ turned out to be a convoluted no-op; implement what it wanted to do
+ correctly, and stop filtering settings given via "git -c var=val".
+
+ * "git commit --dry-run" reported "No, no, you cannot commit." in one
+ case where "git commit" would have allowed you to commit, and this
+ improves it a little bit ("git commit --dry-run --short" still does
+ not give you the correct answer, for example). This is a stop-gap
+ measure in that "commit --short --dry-run" still gives an incorrect
+ result.
+
+ * The experimental "multiple worktree" feature gains more safety to
+ forbid operations on a branch that is checked out or being actively
+ worked on elsewhere, by noticing that e.g. it is being rebased.
+
+ * "git format-patch" learned a new "--base" option to record what
+ (public, well-known) commit the original series was built on in
+ its output.
+
+ * "git commit" learned to pay attention to the "commit.verbose"
+ configuration variable and act as if the "--verbose" option
+ was given from the command line.
+
+ * Updated documentation gives hints to GMail users with two-factor
+ auth enabled that they need app-specific-password when using
+ "git send-email".
+
+ * The manpage output of our documentation did not render well in
+ terminal; typeset literals in bold by default to make them stand
+ out more.
+
+ * The mark-up in the top-level README.md file has been updated to
+ typeset CLI command names differently from the body text.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The embedded args argv-array in the child process is used to build
+ the command line to run pack-objects instead of using a separate
+ array of strings.
+
+ * A test for tags has been restructured so that more parts of it can
+ easily be run on a platform without a working GnuPG.
+
+ * The startup_info data, which records if we are working inside a
+ repository (among other things), are now uniformly available to Git
+ subcommand implementations, and Git avoids attempting to touch
+ references when we are not in a repository.
+
+ * The command line argument parser for "receive-pack" has been
+ rewritten to use parse-options.
+
+ * A major part of "git submodule update" has been ported to C to take
+ advantage of the recently added framework to run download tasks in
+ parallel. Other updates to "git submodule" that move pieces of
+ logic to C continues.
+
+ * Rename bunch of tests on "git clone" for better organization.
+
+ * The tests that involve running httpd leaked the system-wide
+ configuration in /etc/gitconfig to the tested environment.
+
+ * Build updates for MSVC.
+
+ * The repository set-up sequence has been streamlined (the biggest
+ change is that there is no longer git_config_early()), so that we
+ do not attempt to look into refs/* when we know we do not have a
+ Git repository.
+
+ * Code restructuring around the "refs" API to prepare for pluggable
+ refs backends.
+
+ * Sources to many test helper binaries and the generated helpers
+ have been moved to t/helper/ subdirectory to reduce clutter at the
+ top level of the tree.
+
+ * Unify internal logic between "git tag -v" and "git verify-tag"
+ commands by making one directly call into the other.
+
+ * "merge-recursive" strategy incorrectly checked if a path that is
+ involved in its internal merge exists in the working tree.
+
+ * The test scripts for "git p4" (but not "git p4" implementation
+ itself) has been updated so that they would work even on a system
+ where the installed version of Python is python 3.
+
+ * As nobody maintains our in-tree git.spec.in and distros use their
+ own spec file, we stopped pretending that we support "make rpm".
+
+ * Move from "unsigned char[20]" to "struct object_id" continues.
+
+ * The code for warning_errno/die_errno has been refactored and a new
+ error_errno() reporting helper is introduced.
+ (merge 1da045f nd/error-errno later to maint).
+
+ * Running tests with '-x' option to trace the individual command
+ executions is a useful way to debug test scripts, but some tests
+ that capture the standard error stream and check what the command
+ said can be broken with the trace output mixed in. When running
+ our tests under "bash", however, we can redirect the trace output
+ to another file descriptor to keep the standard error of programs
+ being tested intact.
+
+ * t0040 had too many unnecessary repetitions in its test data. Teach
+ test-parse-options program so that a caller can tell what it
+ expects in its output, so that these repetitions can be cleaned up.
+
+ * Add perf test for "rebase -i".
+
+ * Common mistakes when writing gitlink: in our documentation are
+ found by "make check-docs".
+
+ * t9xxx series has been updated primarily for readability, while
+ fixing small bugs in it. A few scripted Porcelain commands have
+ also been updated to fix possible bugs around their use of
+ "test -z" and "test -n".
+
+ * CI test was taught to run git-svn tests.
+
+ * "git cat-file --batch-all" has been sped up, by taking advantage
+ of the fact that it does not have to read a list of objects, in two
+ ways.
+
+ * test updates to make it more readable and maintainable.
+ (merge e6273f4 es/t1500-modernize later to maint).
+
+ * "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
+ config.mak didn't.
+ (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
+
+ * The way how "submodule--helper list" signals unmatch error to its
+ callers has been updated.
+
+ * A bash-ism "local" has been removed from "git submodule" scripted
+ Porcelain.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.8
+----------------
+
+Unless otherwise noted, all the fixes since v2.8 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+
+ * "git config --get-urlmatch", unlike other variants of the "git
+ config --get" family, did not signal error with its exit status
+ when there was no matching configuration.
+
+ * The "--local-env-vars" and "--resolve-git-dir" options of "git
+ rev-parse" failed to work outside a repository when the command's
+ option parsing was rewritten in 1.8.5 era.
+
+ * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
+
+ * Fetching of history by naming a commit object name directly didn't
+ work across remote-curl transport.
+
+ * A small memory leak in an error codepath has been plugged in xdiff
+ code.
+
+ * strbuf_getwholeline() did not NUL-terminate the buffer on certain
+ corner cases in its error codepath.
+
+ * "git mergetool" did not work well with conflicts that both sides
+ deleted.
+
+ * "git send-email" had trouble parsing alias file in mailrc format
+ when lines in it had trailing whitespaces on them.
+
+ * When "git merge --squash" stopped due to conflict, the concluding
+ "git commit" failed to read in the SQUASH_MSG that shows the log
+ messages from all the squashed commits.
+
+ * "git merge FETCH_HEAD" dereferenced NULL pointer when merging
+ nothing into an unborn history (which is arguably unusual usage,
+ which perhaps was the reason why nobody noticed it).
+
+ * When "git worktree" feature is in use, "git branch -d" allowed
+ deletion of a branch that is checked out in another worktree,
+ which was wrong.
+
+ * When "git worktree" feature is in use, "git branch -m" renamed a
+ branch that is checked out in another worktree without adjusting
+ the HEAD symbolic ref for the worktree.
+
+ * "git diff -M" used to work better when two originally identical
+ files A and B got renamed to X/A and X/B by pairing A to X/A and B
+ to X/B, but this was broken in the 2.0 timeframe.
+
+ * "git send-pack --all <there>" was broken when its command line
+ option parsing was written in the 2.6 timeframe.
+
+ * "git format-patch --help" showed `-s` and `--no-patch` as if these
+ are valid options to the command. We already hide `--patch` option
+ from the documentation, because format-patch is about showing the
+ diff, and the documentation now hides these options as well.
+
+ * When running "git blame $path" with unnormalized data in the index
+ for the path, the data in the working tree was blamed, even though
+ "git add" would not have changed what is already in the index, due
+ to "safe crlf" that disables the line-end conversion. It has been
+ corrected.
+
+ * A change back in version 2.7 to "git branch" broke display of a
+ symbolic ref in a non-standard place in the refs/ hierarchy (we
+ expect symbolic refs to appear in refs/remotes/*/HEAD to point at
+ the primary branch the remote has, and as .git/HEAD to point at the
+ branch we locally checked out).
+
+ * A partial rewrite of "git submodule" in the 2.7 timeframe changed
+ the way the gitdir: pointer in the submodules point at the real
+ repository location to use absolute paths by accident. This has
+ been corrected.
+
+ * "git commit" misbehaved in a few minor ways when an empty message
+ is given via -m '', all of which has been corrected.
+
+ * Support for CRAM-MD5 authentication method in "git imap-send" did
+ not work well.
+
+ * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API
+ elements we use in imap-send, which has been adjusted for the change.
+
+ * The socks5:// proxy support added back in 2.6.4 days was not aware
+ that socks5h:// proxies behave differently from socks5:// proxies.
+
+ * "git config" had a codepath that tried to pass a NULL to
+ printf("%s"), which nobody seems to have noticed.
+
+ * On Cygwin, object creation uses the "create a temporary and then
+ rename it to the final name" pattern, not "create a temporary,
+ hardlink it to the final name and then unlink the temporary"
+ pattern.
+
+ 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
+
+ * "merge-octopus" strategy did not ensure that the index is clean
+ when merge begins.
+
+ * When "git merge" notices that the merge can be resolved purely at
+ the tree level (without having to merge blobs) and the resulting
+ tree happens to already exist in the object store, it forgot to
+ update the index, which left an inconsistent state that would
+ break later operations.
+
+ * "git submodule" reports the paths of submodules the command
+ recurses into, but these paths were incorrectly reported when
+ the command was not run from the root level of the superproject.
+
+ * The "user.useConfigOnly" configuration variable makes it an error
+ if users do not explicitly set user.name and user.email. However,
+ its check was not done early enough and allowed another error to
+ trigger, reporting that the default value we guessed from the
+ system setting was unusable. This was a suboptimal end-user
+ experience as we want the users to set user.name/user.email without
+ relying on the auto-detection at all.
+
+ * "git mv old new" did not adjust the path for a submodule that lives
+ as a subdirectory inside old/ directory correctly.
+
+ * "git replace -e" did not honour "core.editor" configuration.
+
+ * "git push" from a corrupt repository that attempts to push a large
+ number of refs deadlocked; the thread to relay rejection notices
+ for these ref updates blocked on writing them to the main thread,
+ after the main thread at the receiving end notices that the push
+ failed and decides not to read these notices and return a failure.
+
+ * mmap emulation on Windows has been optimized and work better without
+ consuming paging store when not needed.
+
+ * A question by "git send-email" to ask the identity of the sender
+ has been updated.
+
+ * UI consistency improvements for "git mergetool".
+
+ * "git rebase -m" could be asked to rebase an entire branch starting
+ from the root, but failed by assuming that there always is a parent
+ commit to the first commit on the branch.
+
+ * Fix a broken "p4 lfs" test.
+
+ * Recent update to Git LFS broke "git p4" by changing the output from
+ its "lfs pointer" subcommand.
+
+ * "git fetch" test t5510 was flaky while running a (forced) automagic
+ garbage collection.
+
+ * Documentation updates to help contributors setting up Travis CI
+ test for their patches.
+
+ * Some multi-byte encoding can have a backslash byte as a later part
+ of one letter, which would confuse "highlight" filter used in
+ gitweb.
+
+ * "git commit-tree" plumbing command required the user to always sign
+ its result when the user sets the commit.gpgsign configuration
+ variable, which was an ancient mistake. Rework "git rebase" that
+ relied on this mistake so that it reads commit.gpgsign and pass (or
+ not pass) the -S option to "git commit-tree" to keep the end-user
+ expectation the same, while teaching "git commit-tree" to ignore
+ the configuration variable. This will stop requiring the users to
+ sign commit objects used internally as an implementation detail of
+ "git stash".
+
+ * "http.cookieFile" configuration variable clearly wants a pathname,
+ but we forgot to treat it as such by e.g. applying tilde expansion.
+
+ * Consolidate description of tilde-expansion that is done to
+ configuration variables that take pathname to a single place.
+
+ * Correct faulty recommendation to use "git submodule deinit ." when
+ de-initialising all submodules, which would result in a strange
+ error message in a pathological corner case.
+
+ * Many 'linkgit:<git documentation page>' references were broken,
+ which are all fixed with this.
+
+ * "git rerere" can get confused by conflict markers deliberately left
+ by the inner merge step, because they are indistinguishable from
+ the real conflict markers left by the outermost merge which are
+ what the end user and "rerere" need to look at. This was fixed by
+ making the conflict markers left by the inner merges a bit longer.
+ (merge 0f9fd5c jc/ll-merge-internal later to maint).
+
+ * CI test was taught to build documentation pages.
+
+ * "git fsck" learned to catch NUL byte in a commit object as
+ potential error and warn.
+
+ * Portability enhancement for "rebase -i" to help platforms whose
+ shell does not like "for i in <empty>" (which is not POSIX-kosher).
+
+ * On Windows, .git and optionally any files whose name starts with a
+ dot are now marked as hidden, with a core.hideDotFiles knob to
+ customize this behaviour.
+
+ * Documentation for "git merge --verify-signatures" has been updated
+ to clarify that the signature of only the commit at the tip is
+ verified. Also the phrasing used for signature and key validity is
+ adjusted to align with that used by OpenPGP.
+
+ * A couple of bugs around core.autocrlf have been fixed.
+
+ * Many commands normalize command line arguments from NFD to NFC
+ variant of UTF-8 on OSX, but commands in the "diff" family did
+ not, causing "git diff $path" to complain that no such path is
+ known to Git. They have been taught to do the normalization.
+
+ * "git difftool" learned to handle unmerged paths correctly in
+ dir-diff mode.
+
+ * The "are we talking with TTY, doing an interactive session?"
+ detection has been updated to work better for "Git for Windows".
+
+ * We forgot to add "git log --decorate=auto" to documentation when we
+ added the feature back in v2.1.0 timeframe.
+ (merge 462cbb4 rj/log-decorate-auto later to maint).
+
+ * "git fast-import --export-marks" would overwrite the existing marks
+ file even when it makes a dump from its custom die routine.
+ Prevent it from doing so when we have an import-marks file but
+ haven't finished reading it.
+ (merge f4beed6 fc/fast-import-broken-marks-file later to maint).
+
+ * "git rebase -i", after it fails to auto-resolve the conflict, had
+ an unnecessary call to "git rerere" from its very early days, which
+ was spotted recently; the call has been removed.
+ (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
+
+ * Other minor clean-ups and documentation updates
+ (merge cd82b7a pa/cherry-pick-doc-typo later to maint).
+ (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
+ (merge aa20cbc rs/apply-name-terminate later to maint).
+ (merge fe17fc0 jc/t2300-setup later to maint).
+ (merge e256eec jk/shell-portability later to maint).
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 98fc4cc..e8ad978 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -61,23 +61,28 @@ Make sure that you have tests for the bug you are fixing. See
t/README for guidance.
When adding a new feature, make sure that you have new tests to show
-the feature triggers the new behaviour when it should, and to show the
-feature does not trigger when it shouldn't. Also make sure that the
-test suite passes after your commit. Do not forget to update the
-documentation to describe the updated behaviour.
-
-Speaking of the documentation, it is currently a liberal mixture of US
-and UK English norms for spelling and grammar, which is somewhat
-unfortunate. A huge patch that touches the files all over the place
-only to correct the inconsistency is not welcome, though. Potential
-clashes with other changes that can result from such a patch are not
-worth it. We prefer to gradually reconcile the inconsistencies in
-favor of US English, with small and easily digestible patches, as a
-side effect of doing some other real work in the vicinity (e.g.
-rewriting a paragraph for clarity, while turning en_UK spelling to
-en_US). Obvious typographical fixes are much more welcomed ("teh ->
-"the"), preferably submitted as independent patches separate from
-other documentation changes.
+the feature triggers the new behavior when it should, and to show the
+feature does not trigger when it shouldn't. After any code change, make
+sure that the entire test suite passes.
+
+If you have an account at GitHub (and you can get one for free to work
+on open source projects), you can use their Travis CI integration to
+test your changes on Linux, Mac (and hopefully soon Windows). See
+GitHub-Travis CI hints section for details.
+
+Do not forget to update the documentation to describe the updated
+behavior and make sure that the resulting documentation set formats
+well. It is currently a liberal mixture of US and UK English norms for
+spelling and grammar, which is somewhat unfortunate. A huge patch that
+touches the files all over the place only to correct the inconsistency
+is not welcome, though. Potential clashes with other changes that can
+result from such a patch are not worth it. We prefer to gradually
+reconcile the inconsistencies in favor of US English, with small and
+easily digestible patches, as a side effect of doing some other real
+work in the vicinity (e.g. rewriting a paragraph for clarity, while
+turning en_UK spelling to en_US). Obvious typographical fixes are much
+more welcomed ("teh -> "the"), preferably submitted as independent
+patches separate from other documentation changes.
Oh, another thing. We are picky about whitespaces. Make sure your
changes do not trigger errors with the sample pre-commit hook shipped
@@ -370,6 +375,47 @@ Know the status of your patch after submission
entitled "What's cooking in git.git" and "What's in git.git" giving
the status of various proposed changes.
+--------------------------------------------------
+GitHub-Travis CI hints
+
+With an account at GitHub (you can get one for free to work on open
+source projects), you can use Travis CI to test your changes on Linux,
+Mac (and hopefully soon Windows). You can find a successful example
+test build here: https://travis-ci.org/git/git/builds/120473209
+
+Follow these steps for the initial setup:
+
+ (1) Fork https://github.com/git/git to your GitHub account.
+ You can find detailed instructions how to fork here:
+ https://help.github.com/articles/fork-a-repo/
+
+ (2) Open the Travis CI website: https://travis-ci.org
+
+ (3) Press the "Sign in with GitHub" button.
+
+ (4) Grant Travis CI permissions to access your GitHub account.
+ You can find more information about the required permissions here:
+ https://docs.travis-ci.com/user/github-oauth-scopes
+
+ (5) Open your Travis CI profile page: https://travis-ci.org/profile
+
+ (6) Enable Travis CI builds for your Git fork.
+
+After the initial setup, Travis CI will run whenever you push new changes
+to your fork of Git on GitHub. You can monitor the test state of all your
+branches here: https://travis-ci.org/<Your GitHub handle>/git/branches
+
+If a branch did not pass all test cases then it is marked with a red
+cross. In that case you can click on the failing Travis CI job and
+scroll all the way down in the log. Find the line "<-- Click here to see
+detailed test output!" and click on the triangle next to the log line
+number to expand the detailed test output. Here is such a failing
+example: https://travis-ci.org/git/git/jobs/122676187
+
+Fix the problem and push your fix to your Git fork. This will trigger
+a new Travis CI build to ensure all tests pass.
+
+
------------------------------------------------
MUA specific hints
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2cd6bdd..2e1b2e4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -81,13 +81,16 @@ Includes
You can include one config file from another by setting the special
`include.path` variable to the name of the file to be included. The
+variable takes a pathname as its value, and is subject to tilde
+expansion.
+
+The
included file is expanded immediately, as if its contents had been
found at the location of the include directive. If the value of the
`include.path` variable is a relative path, the path is considered to be
relative to the configuration file in which the include directive was
-found. The value of `include.path` is subject to tilde expansion: `~/`
-is expanded to the value of `$HOME`, and `~user/` to the specified
-user's home directory. See below for examples.
+found. See below for examples.
+
Example
~~~~~~~
@@ -114,7 +117,7 @@ Example
[include]
path = /path/to/foo.inc ; include by absolute path
path = foo ; expand "foo" relative to the current file
- path = ~/foo ; expand "foo" in your $HOME directory
+ path = ~/foo ; expand "foo" in your `$HOME` directory
Values
@@ -169,6 +172,13 @@ thing on the same output line (e.g. opening parenthesis before the
list of branch names in `log --decorate` output) is set to be
painted with `bold` or some other attribute.
+pathname::
+ A variable that takes a pathname value can be given a
+ string that begins with "`~/`" or "`~user/`", and the usual
+ tilde expansion happens to such a string: `~/`
+ is expanded to the value of `$HOME`, and `~user/` to the
+ specified user's home directory.
+
Variables
~~~~~~~~~
@@ -269,6 +279,12 @@ See linkgit:git-update-index[1].
+
The default is true (when core.filemode is not specified in the config file).
+core.hideDotFiles::
+ (Windows-only) If true, mark newly-created directories and files whose
+ name starts with a dot as hidden. If 'dotGitOnly', only the `.git/`
+ directory is hidden, but no other files starting with a dot. The
+ default mode is 'dotGitOnly'.
+
core.ignoreCase::
If true, this option enables various workarounds to enable
Git to work better on filesystems that are not case sensitive,
@@ -337,9 +353,9 @@ core.quotePath::
core.eol::
Sets the line ending type to use in the working directory for
- files that have the `text` property set. Alternatives are
- 'lf', 'crlf' and 'native', which uses the platform's native
- line ending. The default value is `native`. See
+ files that have the `text` property set when core.autocrlf is false.
+ Alternatives are 'lf', 'crlf' and 'native', which uses the platform's
+ native line ending. The default value is `native`. See
linkgit:gitattributes[5] for more information on end-of-line
conversion.
@@ -486,10 +502,10 @@ repository's usual working tree).
core.logAllRefUpdates::
Enable the reflog. Updates to a ref <ref> is logged to the file
- "$GIT_DIR/logs/<ref>", by appending the new and old
+ "`$GIT_DIR/logs/<ref>`", by appending the new and old
SHA-1, the date/time and the reason of the update, but
only when the file exists. If this configuration
- variable is set to true, missing "$GIT_DIR/logs/<ref>"
+ variable is set to true, missing "`$GIT_DIR/logs/<ref>`"
file is automatically created for branch heads (i.e. under
refs/heads/), remote refs (i.e. under refs/remotes/),
note refs (i.e. under refs/notes/), and the symbolic ref HEAD.
@@ -593,12 +609,11 @@ be delta compressed, but larger binary media files won't be.
Common unit suffixes of 'k', 'm', or 'g' are supported.
core.excludesFile::
- In addition to '.gitignore' (per-directory) and
- '.git/info/exclude', Git looks into this file for patterns
- of files which are not meant to be tracked. "`~/`" is expanded
- to the value of `$HOME` and "`~user/`" to the specified user's
- home directory. Its default value is $XDG_CONFIG_HOME/git/ignore.
- If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
+ Specifies the pathname to the file that contains patterns to
+ describe paths that are not meant to be tracked, in addition
+ to '.gitignore' (per-directory) and '.git/info/exclude'.
+ Defaults to `$XDG_CONFIG_HOME/git/ignore`.
+ If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore`
is used instead. See linkgit:gitignore[5].
core.askPass::
@@ -615,8 +630,25 @@ core.attributesFile::
'.git/info/attributes', Git looks into this file for attributes
(see linkgit:gitattributes[5]). Path expansions are made the same
way as for `core.excludesFile`. Its default value is
- $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
- set or empty, $HOME/.config/git/attributes is used instead.
+ `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
+ set or empty, `$HOME/.config/git/attributes` is used instead.
+
+core.hooksPath::
+ By default Git will look for your hooks in the
+ '$GIT_DIR/hooks' directory. Set this to different path,
+ e.g. '/etc/git/hooks', and Git will try to find your hooks in
+ that directory, e.g. '/etc/git/hooks/pre-receive' instead of
+ in '$GIT_DIR/hooks/pre-receive'.
++
+The path can be either absolute or relative. A relative path is
+taken as relative to the directory where the hooks are run (see
+the "DESCRIPTION" section of linkgit:githooks[5]).
++
+This configuration variable is useful in cases where you'd like to
+centrally configure your Git hooks instead of configuring them on a
+per-repository basis, or as a more flexible and centralized
+alternative to having an `init.templateDir` where you've changed
+default hooks.
core.editor::
Commands such as `commit` and `tag` that lets you edit
@@ -1106,15 +1138,19 @@ commit.status::
message. Defaults to true.
commit.template::
- Specify a file to use as the template for new commit messages.
- "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
- specified user's home directory.
+ Specify the pathname of a file to use as the template for
+ new commit messages.
+
+commit.verbose::
+ A boolean or int to specify the level of verbose with `git commit`.
+ See linkgit:git-commit[1].
credential.helper::
Specify an external helper to be called when a username or
password credential is needed; the helper may consult external
- storage to avoid prompting the user for the credentials. See
- linkgit:gitcredentials[7] for details.
+ storage to avoid prompting the user for the credentials. Note
+ that multiple helpers may be defined. See linkgit:gitcredentials[7]
+ for details.
credential.useHttpPath::
When acquiring credentials, consider the "path" component of an http
@@ -1258,6 +1294,10 @@ format.outputDirectory::
Set a custom directory to store the resulting files instead of the
current working directory.
+format.useAutoBase::
+ A boolean value which lets you enable the `--base=auto` option of
+ format-patch by default.
+
filter.<driver>.clean::
The command which is used to convert the content of a worktree
file to a blob upon checkin. See linkgit:gitattributes[5] for
@@ -1334,7 +1374,7 @@ gc.worktreePruneExpire::
'git worktree prune --expire 3.months.ago'.
This config variable can be used to set a different grace
period. The value "now" may be used to disable the grace
- period and prune $GIT_DIR/worktrees immediately, or "never"
+ period and prune `$GIT_DIR/worktrees` immediately, or "never"
may be used to suppress pruning.
gc.reflogExpire::
@@ -1474,13 +1514,13 @@ grep.fallbackToNoIndex::
is executed outside of a git repository. Defaults to false.
gpg.program::
- Use this custom program instead of "gpg" found on $PATH when
+ Use this custom program instead of "`gpg`" found on `$PATH` when
making or verifying a PGP signature. The program must support the
same command-line interface as GPG, namely, to verify a detached
- signature, "gpg --verify $file - <$signature" is run, and the
+ signature, "`gpg --verify $file - <$signature`" is run, and the
program is expected to signal a good signature by exiting with
code 0, and to generate an ASCII-armored detached signature, the
- standard input of "gpg -bsau $key" is fed with the contents to be
+ standard input of "`gpg -bsau $key`" is fed with the contents to be
signed, and the program is expected to send the result to its
standard output.
@@ -1493,7 +1533,7 @@ gui.diffContext::
made by the linkgit:git-gui[1]. The default is "5".
gui.displayUntracked::
- Determines if linkgit::git-gui[1] shows untracked files
+ Determines if linkgit:git-gui[1] shows untracked files
in the file list. The default is "true".
gui.encoding::
@@ -1654,12 +1694,19 @@ http.emptyAuth::
a username in the URL, as libcurl normally requires a username for
authentication.
+http.extraHeader::
+ Pass an additional HTTP header when communicating with a server. If
+ more than one such entry exists, all of them are added as extra
+ headers. To allow overriding the settings inherited from the system
+ config, an empty value will reset the extra headers to the empty list.
+
http.cookieFile::
- File containing previously stored cookie lines which should be used
+ The pathname of a file containing previously stored cookie lines,
+ which should be used
in the Git http session, if they match the server. The file format
of the file to read cookies from should be plain HTTP headers or
- the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
- NOTE that the file specified with http.cookieFile is only used as
+ the Netscape/Mozilla cookie file format (see `curl(1)`).
+ NOTE that the file specified with http.cookieFile is used only as
input unless http.saveCookies is set.
http.saveCookies::
@@ -1886,6 +1933,14 @@ interactive.singleKey::
setting is silently ignored if portable keystroke input
is not available; requires the Perl module Term::ReadKey.
+interactive.diffFilter::
+ When an interactive command (such as `git add --patch`) shows
+ a colorized diff, git will pipe the diff through the shell
+ command defined by this configuration variable. The command may
+ mark up the diff further for human consumption, provided that it
+ retains a one-to-one correspondence with the lines in the
+ original diff. Defaults to disabled (no filtering).
+
log.abbrevCommit::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
@@ -1901,7 +1956,10 @@ log.decorate::
command. If 'short' is specified, the ref name prefixes 'refs/heads/',
'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
specified, the full ref name (including prefix) will be printed.
- This is the same as the log commands '--decorate' option.
+ If 'auto' is specified, then if the output is going to a terminal,
+ the ref names are shown as if 'short' were given, otherwise no ref
+ names are shown. This is the same as the '--decorate' option
+ of the `git log`.
log.follow::
If `true`, `git log` will act as if the `--follow` option was used when
@@ -2147,8 +2205,11 @@ pack.packSizeLimit::
The maximum size of a pack. This setting only affects
packing to a file when repacking, i.e. the git:// protocol
is unaffected. It can be overridden by the `--max-pack-size`
- option of linkgit:git-repack[1]. The minimum size allowed is
- limited to 1 MiB. The default is unlimited.
+ option of linkgit:git-repack[1]. Reaching this limit results
+ in the creation of multiple packfiles; which in turn prevents
+ bitmaps from being created.
+ The minimum size allowed is limited to 1 MiB.
+ The default is unlimited.
Common unit suffixes of 'k', 'm', or 'g' are
supported.
@@ -2548,8 +2609,9 @@ repack.writeBitmaps::
objects to disk (e.g., when `git repack -a` is run). This
index can speed up the "counting objects" phase of subsequent
packs created for clones and fetches, at the cost of some disk
- space and extra time spent on the initial repack. Defaults to
- false.
+ space and extra time spent on the initial repack. This has
+ no effect if multiple packfiles are created.
+ Defaults to false.
rerere.autoUpdate::
When set to true, `git-rerere` updates the index with the
@@ -2729,6 +2791,17 @@ submodule.<name>.ignore::
"--ignore-submodules" option. The 'git submodule' commands are not
affected by this setting.
+submodule.fetchJobs::
+ Specifies how many submodules are fetched/cloned at the same time.
+ A positive integer allows up to that number of submodules fetched
+ in parallel. A value of 0 will give some reasonable default.
+ If unset, it defaults to 1.
+
+tag.forceSignAnnotated::
+ A boolean to specify whether annotated tags created should be GPG signed.
+ If `--annotate` is specified on the command line, it takes
+ precedence over this option.
+
tag.sort::
This variable controls the sort ordering of tags when displayed by
linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 6eaa452..d78cfc5 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -108,9 +108,13 @@ diff.renameLimit::
detection; equivalent to the 'git diff' option '-l'.
diff.renames::
- Tells Git to detect renames. If set to any boolean value, it
- will enable basic rename detection. If set to "copies" or
- "copy", it will detect copies, as well.
+ Whether and how Git detects renames. If set to "false",
+ rename detection is disabled. If set to "true", basic rename
+ detection is enabled. If set to "copies" or "copy", Git will
+ detect copies, as well. Defaults to true. Note that this
+ affects only 'git diff' Porcelain like linkgit:git-diff[1] and
+ linkgit:git-log[1], and not lower level commands such as
+ linkgit:git-diff-files[1].
diff.suppressBlankEmpty::
A boolean to inhibit the standard behavior of printing a space
@@ -166,6 +170,11 @@ diff.tool::
include::mergetools-diff.txt[]
+diff.compactionHeuristic::
+ Set this option to `true` to enable an experimental heuristic that
+ shifts the hunk boundary in an attempt to make the resulting
+ patch easier to read.
+
diff.algorithm::
Choose a diff algorithm. The variants are as follows:
+
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 306b7e3..d9ae681 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -26,12 +26,12 @@ ifndef::git-format-patch[]
ifdef::git-diff[]
This is the default.
endif::git-diff[]
-endif::git-format-patch[]
-s::
--no-patch::
Suppress diff output. Useful for commands like `git show` that
show the patch by default, or to cancel the effect of `--patch`.
+endif::git-format-patch[]
-U<n>::
--unified=<n>::
@@ -63,6 +63,13 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
+--compaction-heuristic::
+--no-compaction-heuristic::
+ These are to help debugging and tuning an experimental
+ heuristic (which is off by default) that shifts the hunk
+ boundary in an attempt to make the resulting patch easier
+ to read.
+
--minimal::
Spend extra time to make sure the smallest possible
diff is produced.
@@ -271,7 +278,7 @@ For example, `--word-diff-regex=.` will treat each character as a word
and, correspondingly, show differences character by character.
+
The regex can also be set via a diff driver or configuration option, see
-linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
+linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers
override configuration settings.
@@ -286,8 +293,8 @@ endif::git-format-patch[]
ifndef::git-format-patch[]
--check::
- Warn if changes introduce whitespace errors. What are
- considered whitespace errors is controlled by `core.whitespace`
+ Warn if changes introduce conflict markers or whitespace errors.
+ What are considered whitespace errors is controlled by `core.whitespace`
configuration. By default, trailing whitespaces (including
lines that solely consist of whitespaces) and a space character
that is immediately followed by a tab character inside the
diff --git a/Documentation/everyday.txto b/Documentation/everyday.txto
index c5047d8..ae555bd 100644
--- a/Documentation/everyday.txto
+++ b/Documentation/everyday.txto
@@ -1,7 +1,7 @@
Everyday Git With 20 Commands Or So
===================================
-This document has been moved to linkgit:giteveryday[1].
+This document has been moved to linkgit:giteveryday[7].
Please let the owners of the referring site know so that they can update the
link you clicked to get here.
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index d9ed6a1..8ddb207 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -13,7 +13,7 @@ SYNOPSIS
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
- [--ignore-space-change | --ignore-whitespace ]
+ [--ignore-space-change | --ignore-whitespace]
[--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=<path>] [--include=<path>] [--directory=<root>]
[--verbose] [--unsafe-paths] [<patch>...]
@@ -21,6 +21,8 @@ SYNOPSIS
DESCRIPTION
-----------
Reads the supplied diff output (i.e. "a patch") and applies it to files.
+When running from a subdirectory in a repository, patched paths
+outside the directory are ignored.
With the `--index` option the patch is also applied to the index, and
with the `--cached` option the patch is only applied to the index.
Without these options, the command applies the patch only to files,
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index e94367a..611754f 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -112,7 +112,7 @@ EXIT STATUS
SEE ALSO
--------
linkgit:gitignore[5]
-linkgit:gitconfig[5]
+linkgit:git-config[1]
linkgit:git-ls-files[1]
GIT
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 6154e57..c104a59 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -128,7 +128,7 @@ effect to your index in a row.
--allow-empty-message::
By default, cherry-picking a commit with an empty message will fail.
- This option overrides that behaviour, allowing commits with empty
+ This option overrides that behavior, allowing commits with empty
messages to be cherry picked.
--keep-redundant-commits::
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index b7c467a..1b15cd7 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -14,8 +14,8 @@ SYNOPSIS
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch]
- [--recursive | --recurse-submodules] [--] <repository>
- [<directory>]
+ [--recursive | --recurse-submodules] [--[no-]shallow-submodules]
+ [--jobs <n>] [--] <repository> [<directory>]
DESCRIPTION
-----------
@@ -191,7 +191,9 @@ objects from the source repository into a pack in the cloned repository.
Create a 'shallow' clone with a history truncated to the
specified number of commits. Implies `--single-branch` unless
`--no-single-branch` is given to fetch the histories near the
- tips of all branches.
+ tips of all branches. This implies `--shallow-submodules`. If
+ you want to have a shallow superproject clone, but full submodules,
+ also pass `--no-shallow-submodules`.
--[no-]single-branch::
Clone only the history leading to the tip of a single branch,
@@ -212,6 +214,9 @@ objects from the source repository into a pack in the cloned repository.
repository does not have a worktree/checkout (i.e. if any of
`--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
+--[no-]shallow-submodules::
+ All submodules which are cloned will be shallow with a depth of 1.
+
--separate-git-dir=<git dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
@@ -219,6 +224,10 @@ objects from the source repository into a pack in the cloned repository.
The result is Git repository can be separated from working
tree.
+-j <n>::
+--jobs <n>::
+ The number of submodules fetched at the same time.
+ Defaults to the `submodule.fetchJobs` option.
<repository>::
The (possibly remote) repository to clone from. See the
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 48c33d7..cb69faa 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -61,8 +61,8 @@ OPTIONS
stuck to the option without a space.
--no-gpg-sign::
- Countermand `commit.gpgSign` configuration variable that is
- set to force each and every commit to be signed.
+ Do not GPG-sign commit, to countermand a `--gpg-sign` option
+ given earlier on the command line.
Commit Information
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9ec6b3c..d474226 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -290,7 +290,8 @@ configuration variable documented in linkgit:git-config[1].
what changes the commit has.
Note that this diff output doesn't have its
lines prefixed with '#'. This diff will not be a part
- of the commit message.
+ of the commit message. See the `commit.verbose` configuration
+ variable in linkgit:git-config[1].
+
If specified twice, show in addition the unified diff between
what would be committed and the worktree files, i.e. the unstaged
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 153b2d8..6843114 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -58,13 +58,13 @@ that location (you can say '--local' but that is the default).
This command will fail with non-zero status upon error. Some exit
codes are:
-. The config file is invalid (ret=3),
-. can not write to the config file (ret=4),
-. no section or name was provided (ret=2),
-. the section or key is invalid (ret=1),
-. you try to unset an option which does not exist (ret=5),
-. you try to unset/set an option for which multiple lines match (ret=5), or
-. you try to use an invalid regexp (ret=6).
+- The section or key is invalid (ret=1),
+- no section or name was provided (ret=2),
+- the config file is invalid (ret=3),
+- the config file cannot be written (ret=4),
+- you try to unset an option which does not exist (ret=5),
+- you try to unset/set an option for which multiple lines match (ret=5), or
+- you try to use an invalid regexp (ret=6).
On success, the command returns the exit code 0.
@@ -86,8 +86,7 @@ OPTIONS
found and the last value if multiple key values were found.
--get-all::
- Like get, but does not fail if the number of values for the key
- is not exactly one.
+ Like get, but returns all values for a multi-valued key.
--get-regexp::
Like --get-all, but interprets the name as a regular expression and
@@ -102,7 +101,7 @@ OPTIONS
given URL is returned (if no such key exists, the value for
section.key is used as a fallback). When given just the
section as name, do so for all the keys in the section and
- list them.
+ list them. Returns error code 1 if no value is found.
--global::
For writing options: write to global `~/.gitconfig` file
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index 8680f45..239623c 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -104,6 +104,10 @@ be in a separate packet, and the list must end with a flush packet.
The remote heads to update from. This is relative to
$GIT_DIR (e.g. "HEAD", "refs/heads/master"). When
unspecified, update from all heads the remote side has.
++
+If the remote has enabled the options `uploadpack.allowTipSHA1InWant` or
+`uploadpack.allowReachableSHA1InWant`, they may alternatively be 40-hex
+sha1s present on the remote.
SEE ALSO
--------
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 73fd9e8..003731f 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -205,7 +205,7 @@ to other tags will be rewritten to point to the underlying commit.
Remap to ancestor
~~~~~~~~~~~~~~~~~
-By using linkgit:rev-list[1] arguments, e.g., path limiters, you can limit the
+By using linkgit:git-rev-list[1] arguments, e.g., path limiters, you can limit the
set of revisions which get rewritten. However, positive refs on the command
line are distinguished: we don't let them be excluded by such limiters. For
this purpose, they are instead rewritten to point at the nearest ancestor that
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 012e8f9..d9d406d 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -76,7 +76,7 @@ OPTIONS
specified commit (HEAD if not specified).
--contains [<object>]::
- Only list tags which contain the specified commit (HEAD if not
+ Only list refs which contain the specified commit (HEAD if not
specified).
FIELD NAMES
@@ -179,7 +179,7 @@ returns an empty string instead.
As a special case for the date-type fields, you may specify a format for
the date by adding `:` followed by date format name (see the
-values the `--date` option to linkgit::git-rev-list[1] takes).
+values the `--date` option to linkgit:git-rev-list[1] takes).
EXAMPLES
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 6821441..bdeecd5 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -265,6 +265,11 @@ 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>::
+ Record the base tree information to identify the state the
+ patch series applies to. See the BASE TREE INFORMATION section
+ below for details.
+
--root::
Treat the revision argument as a <revision range>, even if it
is just a single commit (that would normally be treated as a
@@ -520,6 +525,61 @@ This should help you to submit patches inline using KMail.
5. Back in the compose window: add whatever other text you wish to the
message, complete the addressing and subject fields, and press send.
+BASE TREE INFORMATION
+---------------------
+
+The base tree information block is used for maintainers or third party
+testers to know the exact state the patch series applies to. It consists
+of the 'base commit', which is a well-known commit that is part of the
+stable part of the project history everybody else works off of, and zero
+or more 'prerequisite patches', which are well-known patches in flight
+that is not yet part of the 'base commit' that need to be applied on top
+of 'base commit' in topological order before the patches can be applied.
+
+The 'base commit' is shown as "base-commit: " followed by the 40-hex of
+the commit object name. A 'prerequisite patch' is shown as
+"prerequisite-patch-id: " followed by the 40-hex 'patch id', which can
+be obtained by passing the patch through the `git patch-id --stable`
+command.
+
+Imagine that on top of the public commit P, you applied well-known
+patches X, Y and Z from somebody else, and then built your three-patch
+series A, B, C, the history would be like:
+
+................................................
+---P---X---Y---Z---A---B---C
+................................................
+
+With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
+`--cover-letter` of using `Z..C` instead of `-3 C` to specify the
+range), the base tree information block is shown at the end of the
+first message the command outputs (either the first patch, or the
+cover letter), like this:
+
+------------
+base-commit: P
+prerequisite-patch-id: X
+prerequisite-patch-id: Y
+prerequisite-patch-id: Z
+------------
+
+For non-linear topology, such as
+
+................................................
+---P---X---A---M---C
+ \ /
+ Y---Z---B
+................................................
+
+You can also use `git format-patch --base=P -3 C` to generate patches
+for A, B and C, and the identifiers for P, X, Y, Z are appended at the
+end of the first message.
+
+If set `--base=auto` in cmdline, it will track base commit automatically,
+the base commit will be the merge base of tip commit of the remote-tracking
+branch and revision-range specified in cmdline.
+For a local branch, you need to track a remote branch by `git branch
+--set-upstream-to` before using this option.
EXAMPLES
--------
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 8174d27..6364e5d 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -130,7 +130,12 @@ The template directory will be one of the following (in order):
- the default template directory: `/usr/share/git-core/templates`.
The default template directory includes some directory structure, suggested
-"exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see linkgit:githooks[5]).
+"exclude patterns" (see linkgit:gitignore[5]), and sample hook files.
+
+The sample hooks are all disabled by default, To enable one of the
+sample hooks rename it by removing its `.sample` suffix.
+
+See linkgit:githooks[5] for more general info on hook execution.
EXAMPLES
--------
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 03f9580..dec379b 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -29,12 +29,14 @@ OPTIONS
(works only for a single file).
--no-decorate::
---decorate[=short|full|no]::
+--decorate[=short|full|auto|no]::
Print out the ref names of any commits that are shown. If 'short' is
specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
'refs/remotes/' will not be printed. If 'full' is specified, the
- full ref name (including prefix) will be printed. The default option
- is 'short'.
+ full ref name (including prefix) will be printed. If 'auto' is
+ specified, then if the output is going to a terminal, the ref names
+ are shown as if 'short' were given, otherwise no ref names are
+ shown. The default option is 'short'.
--source::
Print out the ref name given on the command line by which each
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 0947084..3bbc731 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -85,7 +85,7 @@ with comments and suggestions on the message you are responding to, and to
conclude it with a patch submission, separating the discussion and the
beginning of the proposed commit log message with a scissors line.
+
-This can enabled by default with the configuration option mailinfo.scissors.
+This can be enabled by default with the configuration option mailinfo.scissors.
--no-scissors::
Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 07f7295..b758d55 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -11,6 +11,7 @@ SYNOPSIS
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+ [--[no-]allow-unrelated-histories]
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
'git merge' <msg> HEAD <commit>...
'git merge' --abort
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 8de3499..9c4fd68 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -402,4 +402,4 @@ on the `notes.rewrite.<command>` and `notes.rewriteRef` settings.
GIT
---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 35e3170..88ba42b 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -551,6 +551,17 @@ git-p4.keepEmptyCommits::
A changelist that contains only excluded files will be imported
as an empty commit if this boolean option is set to true.
+git-p4.mapUser::
+ Map a P4 user to a name and email address in Git. Use a string
+ with the following format to create a mapping:
++
+-------------
+git config --add git-p4.mapUser "p4user = First Last <mail@address.com>"
+-------------
++
+A mapping will override any user information from P4. Mappings for
+multiple P4 user can be defined.
+
Submit variables
~~~~~~~~~~~~~~~~
git-p4.detectRenames::
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index bbea529..19cdcd0 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -110,7 +110,8 @@ base-name::
--max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB.
- If specified, multiple packfiles may be created.
+ If specified, multiple packfiles may be created, which also
+ prevents the creation of a bitmap index.
The default is unlimited, unless the config variable
`pack.packSizeLimit` is set.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a62a2a6..d033b25 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -128,6 +128,15 @@ unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
+--autostash::
+--no-autostash::
+ Before starting rebase, stash local modifications away (see
+ linkgit:git-stash[1]) if needed, and apply the stash when
+ done. `--no-autostash` is useful to override the `rebase.autoStash`
+ configuration variable (see linkgit:git-config[1]).
++
+This option is only valid when "--rebase" is used.
+
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6ed610a..0387b40 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -391,9 +391,6 @@ idea unless you know what you are doing (see BUGS below).
final history. <cmd> will be interpreted as one or more shell
commands.
+
-This option can only be used with the `--interactive` option
-(see INTERACTIVE MODE below).
-+
You may execute several commands by either using one instance of `--exec`
with several commands:
+
@@ -406,6 +403,9 @@ or by giving more than one `--exec`:
If `--autosquash` is used, "exec" lines will not be appended for
the intermediate commits, and will only appear at the end of each
squash/fixup series.
++
+This uses the `--interactive` machinery internally, but it can be run
+without an explicit `--interactive`.
--root::
Rebase all commits reachable from <branch>, instead of
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index af230d0..b9c02ce 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -106,7 +106,8 @@ other objects in that pack they already have locally.
--max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB.
- If specified, multiple packfiles may be created.
+ If specified, multiple packfiles may be created, which also
+ prevents the creation of a bitmap index.
The default is unlimited, unless the config variable
`pack.packSizeLimit` is set.
@@ -115,7 +116,8 @@ other objects in that pack they already have locally.
Write a reachability bitmap index as part of the repack. This
only makes sense when used with `-a` or `-A`, as the bitmaps
must be able to refer to all reachable objects. This option
- overrides the setting of `pack.writeBitmaps`.
+ overrides the setting of `repack.writeBitmaps`. This option
+ has no effect if multiple packfiles are created.
--pack-kept-objects::
Include objects in `.keep` files when repacking. Note that we
@@ -123,7 +125,7 @@ other objects in that pack they already have locally.
This means that we may duplicate objects, but this makes the
option safe to use when there are concurrent pushes or fetches.
This option is generally only useful if you are writing bitmaps
- with `-b` or `pack.writeBitmaps`, as it ensures that the
+ with `-b` or `repack.writeBitmaps`, as it ensures that the
bitmapped packfile has the necessary objects.
Configuration
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 771a7b5..a88d186 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -450,6 +450,19 @@ edit ~/.gitconfig to specify your account settings:
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
+https://security.google.com/settings/security/apppasswords to setup an
+app-specific password. Once setup, you can store it with the credentials
+helper:
+
+ $ git credential fill
+ protocol=smtp
+ host=smtp.gmail.com
+ username=youname@gmail.com
+ password=app-password
+
+
Once your commits are ready to be sent to the mailing list, run the
following commands:
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 1572f05..9226c43 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -13,10 +13,10 @@ SYNOPSIS
[--reference <repository>] [--depth <depth>] [--] <repository> [<path>]
'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
'git submodule' [--quiet] init [--] [<path>...]
-'git submodule' [--quiet] deinit [-f|--force] [--] <path>...
+'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
[-f|--force] [--rebase|--merge] [--reference <repository>]
- [--depth <depth>] [--recursive] [--] [<path>...]
+ [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]
'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
[commit] [--] [<path>...]
'git submodule' [--quiet] foreach [--recursive] <command>
@@ -140,12 +140,15 @@ deinit::
tree. Further calls to `git submodule update`, `git submodule foreach`
and `git submodule sync` will skip any unregistered submodules until
they are initialized again, so use this command if you don't want to
- have a local checkout of the submodule in your work tree anymore. If
+ have a local checkout of the submodule in your working tree anymore. If
you really want to remove a submodule from the repository and commit
that use linkgit:git-rm[1] instead.
+
-If `--force` is specified, the submodule's work tree will be removed even if
-it contains local modifications.
+When the command is run without pathspec, it errors out,
+instead of deinit-ing everything, to prevent mistakes.
++
+If `--force` is specified, the submodule's working tree will
+be removed even if it contains local modifications.
update::
+
@@ -247,6 +250,10 @@ OPTIONS
--quiet::
Only print error messages.
+--all::
+ This option is only valid for the deinit command. Unregister all
+ submodules in the working tree.
+
-b::
--branch::
Branch of repository to add as submodule.
@@ -257,8 +264,8 @@ OPTIONS
--force::
This option is only valid for add, deinit and update commands.
When running add, allow adding an otherwise ignored submodule path.
- When running deinit the submodule work trees will be removed even if
- they contain local changes.
+ When running deinit the submodule working trees will be removed even
+ if they contain local changes.
When running update (only effective with the checkout procedure),
throw away local changes in submodules when switching to a
different commit; and always run a checkout operation in the
@@ -377,6 +384,11 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
clone with a history truncated to the specified number of revisions.
See linkgit:git-clone[1]
+-j <n>::
+--jobs <n>::
+ This option is only valid for the update command.
+ Clone new submodules in parallel with as many jobs.
+ Defaults to the `submodule.fetchJobs` option.
<path>...::
Paths to submodule(s). When specified this will restrict the command
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 62c76c1..c622345 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -9,7 +9,7 @@ git-worktree - Manage multiple working trees
SYNOPSIS
--------
[verse]
-'git worktree add' [-f] [--detach] [-b <new-branch>] <path> [<branch>]
+'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>]
'git worktree prune' [-n] [-v] [--expire <expire>]
'git worktree list' [--porcelain]
@@ -87,6 +87,12 @@ OPTIONS
With `add`, detach HEAD in the new working tree. See "DETACHED HEAD"
in linkgit:git-checkout[1].
+--[no-]checkout::
+ By default, `add` checks out `<branch>`, however, `--no-checkout` can
+ be used to suppress checkout in order to make customizations,
+ such as configuring sparse-checkout. See "Sparse checkout"
+ in linkgit:git-read-tree[1].
+
-n::
--dry-run::
With `prune`, do not remove anything; just report what it would
diff --git a/Documentation/git.txt b/Documentation/git.txt
index adc940b..5490d3c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,18 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.8.0/git.html[documentation for release 2.8]
+* link:v2.9.0/git.html[documentation for release 2.9]
* release notes for
+ link:RelNotes/2.9.0.txt[2.9].
+
+* link:v2.8.4/git.html[documentation for release 2.8.4]
+
+* release notes for
+ link:RelNotes/2.8.4.txt[2.8.4],
+ link:RelNotes/2.8.3.txt[2.8.3],
+ link:RelNotes/2.8.2.txt[2.8.2],
+ link:RelNotes/2.8.1.txt[2.8.1],
link:RelNotes/2.8.0.txt[2.8].
* link:v2.7.3/git.html[documentation for release 2.7.3]
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 1c75be0..f3a75d1 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -106,6 +106,11 @@ variable, each helper will be tried in turn, and may provide a username,
password, or nothing. Once Git has acquired both a username and a
password, no more helpers will be tried.
+If `credential.helper` is configured to the empty string, this resets
+the helper list to empty (so you may override a helper set by a
+lower-priority config file by configuring the empty-string helper,
+followed by whatever set of helpers you would like).
+
CREDENTIAL CONTEXTS
-------------------
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index a2f59b1..d82e912 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -7,24 +7,35 @@ githooks - Hooks used by Git
SYNOPSIS
--------
-$GIT_DIR/hooks/*
+$GIT_DIR/hooks/* (or \`git config core.hooksPath`/*)
DESCRIPTION
-----------
-Hooks are little scripts you can place in `$GIT_DIR/hooks`
-directory to trigger action at certain points. When
-'git init' is run, a handful of example hooks are copied into the
-`hooks` directory of the new repository, but by default they are
-all disabled. To enable a hook, rename it by removing its `.sample`
-suffix.
+Hooks are programs you can place in a hooks directory to trigger
+actions at certain points in git's execution. Hooks that don't have
+the executable bit set are ignored.
-NOTE: It is also a requirement for a given hook to be executable.
-However - in a freshly initialized repository - the `.sample` files are
-executable by default.
+By default the hooks directory is `$GIT_DIR/hooks`, but that can be
+changed via the `core.hooksPath` configuration variable (see
+linkgit:git-config[1]).
-This document describes the currently defined hooks.
+Before Git invokes a hook, it changes its working directory to either
+the root of the working tree in a non-bare repository, or to the
+$GIT_DIR in a bare repository.
+
+Hooks can get their arguments via the environment, command-line
+arguments, and stdin. See the documentation for each hook below for
+details.
+
+'git init' may copy hooks to the new repository, depending on its
+configuration. See the "TEMPLATE DIRECTORY" section in
+linkgit:git-init[1] for details. When the rest of this document refers
+to "default hooks" it's talking about the default template shipped
+with Git.
+
+The currently supported hooks are described below.
HOOKS
-----
@@ -32,15 +43,15 @@ HOOKS
applypatch-msg
~~~~~~~~~~~~~~
-This hook is invoked by 'git am' script. It takes a single
+This hook is invoked by 'git am'. It takes a single
parameter, the name of the file that holds the proposed commit
-log message. Exiting with non-zero status causes
-'git am' to abort before applying the patch.
+log message. Exiting with a non-zero status causes 'git am' to abort
+before applying the patch.
The hook is allowed to edit the message file in place, and can
be used to normalize the message into some project standard
-format (if the project has one). It can also be used to refuse
-the commit after inspecting the message file.
+format. It can also be used to refuse the commit after inspecting
+the message file.
The default 'applypatch-msg' hook, when enabled, runs the
'commit-msg' hook, if the latter is enabled.
@@ -73,10 +84,10 @@ pre-commit
~~~~~~~~~~
This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option. It takes no parameter, and is
+with the `--no-verify` option. It takes no parameters, and is
invoked before obtaining the proposed commit log message and
-making a commit. Exiting with non-zero status from this script
-causes the 'git commit' to abort.
+making a commit. Exiting with a non-zero status from this script
+causes the 'git commit' command to abort before creating a commit.
The default 'pre-commit' hook, when enabled, catches introduction
of lines with trailing whitespaces and aborts the commit when
@@ -115,15 +126,15 @@ commit-msg
~~~~~~~~~~
This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option. It takes a single parameter, the
+with the `--no-verify` option. It takes a single parameter, the
name of the file that holds the proposed commit log message.
-Exiting with non-zero status causes the 'git commit' to
+Exiting with a non-zero status causes the 'git commit' to
abort.
-The hook is allowed to edit the message file in place, and can
-be used to normalize the message into some project standard
-format (if the project has one). It can also be used to refuse
-the commit after inspecting the message file.
+The hook is allowed to edit the message file in place, and can be used
+to normalize the message into some project standard format. It
+can also be used to refuse the commit after inspecting the message
+file.
The default 'commit-msg' hook, when enabled, detects duplicate
"Signed-off-by" lines, and aborts the commit if one is found.
@@ -131,8 +142,8 @@ The default 'commit-msg' hook, when enabled, detects duplicate
post-commit
~~~~~~~~~~~
-This hook is invoked by 'git commit'. It takes no
-parameter, and is invoked after a commit is made.
+This hook is invoked by 'git commit'. It takes no parameters, and is
+invoked after a commit is made.
This hook is meant primarily for notification, and cannot affect
the outcome of 'git commit'.
@@ -267,9 +278,11 @@ does not know the entire set of branches, so it would end up
firing one e-mail per ref when used naively, though. The
<<post-receive,'post-receive'>> hook is more suited to that.
-Another use suggested on the mailing list is to use this hook to
-implement access control which is finer grained than the one
-based on filesystem group.
+In an environment that restricts the users' access only to git
+commands over the wire, this hook can be used to implement access
+control without relying on filesystem ownership and group
+membership. See linkgit:git-shell[1] for how you might use the login
+shell to restrict the user's access to only git commands.
Both standard output and standard error output are forwarded to
'git send-pack' on the other end, so you can simply `echo` messages
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index cafc284..8ad29e6 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -145,7 +145,7 @@ current branch integrates with) obviously do not work, as there is no
A fast-forward is a special type of <<def_merge,merge>> where you have a
<<def_revision,revision>> and you are "merging" another
<<def_branch,branch>>'s changes that happen to be a descendant of what
- you have. In such these cases, you do not make a new <<def_merge,merge>>
+ you have. In such a case, you do not make a new <<def_merge,merge>>
<<def_commit,commit>> but instead just update to his
revision. This will happen frequently on a
<<def_remote_tracking_branch,remote-tracking branch>> of a remote
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
new file mode 100755
index 0000000..476cc30
--- /dev/null
+++ b/Documentation/lint-gitlink.perl
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+use File::Find;
+use Getopt::Long;
+
+my $basedir = ".";
+GetOptions("basedir=s" => \$basedir)
+ or die("Cannot parse command line arguments\n");
+
+my $found_errors = 0;
+
+sub report {
+ my ($where, $what, $error) = @_;
+ print "$where: $error: $what\n";
+ $found_errors = 1;
+}
+
+sub grab_section {
+ my ($page) = @_;
+ open my $fh, "<", "$basedir/$page.txt";
+ my $firstline = <$fh>;
+ chomp $firstline;
+ close $fh;
+ my ($section) = ($firstline =~ /.*\((\d)\)$/);
+ return $section;
+}
+
+sub lint {
+ my ($file) = @_;
+ open my $fh, "<", $file
+ or return;
+ while (<$fh>) {
+ my $where = "$file:$.";
+ while (s/linkgit:((.*?)\[(\d)\])//) {
+ my ($target, $page, $section) = ($1, $2, $3);
+
+ # De-AsciiDoc
+ $page =~ s/{litdd}/--/g;
+
+ if ($page !~ /^git/) {
+ report($where, $target, "nongit link");
+ next;
+ }
+ if (! -f "$basedir/$page.txt") {
+ report($where, $target, "no such source");
+ next;
+ }
+ $real_section = grab_section($page);
+ if ($real_section != $section) {
+ report($where, $target,
+ "wrong section (should be $real_section)");
+ next;
+ }
+ }
+ }
+ close $fh;
+}
+
+sub lint_it {
+ lint($File::Find::name) if -f && /\.txt$/;
+}
+
+if (!@ARGV) {
+ find({ wanted => \&lint_it, no_chdir => 1 }, $basedir);
+} else {
+ for (@ARGV) {
+ lint($_);
+ }
+}
+
+exit $found_errors;
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f08e9b8..5b4a62e 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -89,8 +89,11 @@ option can be used to override --squash.
--verify-signatures::
--no-verify-signatures::
- Verify that the commits being merged have good and trusted GPG signatures
- and abort the merge in case they do not.
+ Verify that the tip commit of the side branch being merged is
+ signed with a valid key, i.e. a key that has a valid uid: in the
+ default trust model, this means the signing key has been signed by
+ a trusted key. If the tip commit of the side branch is not signed
+ with a valid key, the merge is aborted.
--summary::
--no-summary::
@@ -114,3 +117,11 @@ ifndef::git-pull[]
reporting.
endif::git-pull[]
+
+--allow-unrelated-histories::
+ By default, `git merge` command refuses to merge histories
+ that do not share a common ancestor. This option can be
+ used to override this safety when merging histories of two
+ projects that started their lives independently. As that is
+ a very rare occasion, no configuration variable to enable
+ this by default exists and will not be added.
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 671cebd..29b19b9 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -143,8 +143,8 @@ ifndef::git-rev-list[]
- '%N': commit notes
endif::git-rev-list[]
- '%GG': raw verification message from GPG for a signed commit
-- '%G?': show "G" for a Good signature, "B" for a Bad signature, "U" for a good,
- untrusted signature and "N" for no signature
+- '%G?': show "G" for a good (valid) signature, "B" for a bad signature,
+ "U" for a good signature with unknown validity and "N" for no signature
- '%GS': show the name of the signer for a signed commit
- '%GK': show the key used to sign a signed commit
- '%gD': reflog selector, e.g., `refs/stash@{1}`
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 54b88b6..6c67182 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -42,6 +42,20 @@ people using 80-column terminals.
verbatim; this means that invalid sequences in the original
commit may be copied to the output.
+--expand-tabs=<n>::
+--expand-tabs::
+--no-expand-tabs::
+ Perform a tab expansion (replace each tab with enough spaces
+ to fill to the next display column that is multiple of '<n>')
+ in the log message before showing it in the output.
+ `--expand-tabs` is a short-hand for `--expand-tabs=8`, and
+ `--no-expand-tabs` is a short-hand for `--expand-tabs=0`,
+ which disables tab expansion.
++
+By default, tabs are expanded in pretty formats that indent the log
+message by 4 spaces (i.e. 'medium', which is the default, 'full',
+and 'fuller').
+
ifndef::git-rev-list[]
--notes[=<treeish>]::
Show the notes (see linkgit:git-notes[1]) that annotate the
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index 0d8b99b..20741f3 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -63,13 +63,6 @@ parse for configuration, rather than looking in the usual files. Regular
Specify whether include directives should be followed in parsed files.
Regular `git_config` defaults to `1`.
-There is a special version of `git_config` called `git_config_early`.
-This version takes an additional parameter to specify the repository
-config, instead of having it looked up via `git_path`. This is useful
-early in a Git program before the repository has been found. Unless
-you're working with early setup code, you probably don't want to use
-this.
-
Reading Specific Files
----------------------
diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt
index e44426d..75368f2 100644
--- a/Documentation/technical/api-credentials.txt
+++ b/Documentation/technical/api-credentials.txt
@@ -243,7 +243,7 @@ appended to its command line, which is one of:
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[7] for a detailed specification).
+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
@@ -268,4 +268,4 @@ See also
linkgit:gitcredentials[7]
-linkgit:git-config[5] (See configuration variables `credential.*`)
+linkgit:git-config[1] (See configuration variables `credential.*`)
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 5f0757d..27bd701 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -144,8 +144,12 @@ There are some macros to easily define options:
`OPT_COUNTUP(short, long, &int_var, description)`::
Introduce a count-up option.
- `int_var` is incremented on each use of `--option`, and
- reset to zero with `--no-option`.
+ Each use of `--option` increments `int_var`, starting from zero
+ (even if initially negative), and `--no-option` resets it to
+ zero. To determine if `--option` or `--no-option` was encountered at
+ all, initialize `int_var` to a negative value, and if it is still
+ negative after parse_options(), then neither `--option` nor
+ `--no-option` was seen.
`OPT_BIT(short, long, &int_var, description, mask)`::
Introduce a boolean option.
@@ -231,6 +235,13 @@ There are some macros to easily define options:
pass the command-line option, which can be specified multiple times,
to another command.
+`OPT_CMDMODE(short, long, &int_var, description, enum_val)`::
+ Define an "operation mode" option, only one of which in the same
+ group of "operating mode" options that share the same `int_var`
+ can be given by the user. `enum_val` is set to `int_var` when the
+ option is used, but an error is reported if other "operating mode"
+ option has already set its value to the same `int_var`.
+
The last element of the array must be `OPT_END()`.
diff --git a/Documentation/technical/api-trace.txt b/Documentation/technical/api-trace.txt
index 097a651..fadb597 100644
--- a/Documentation/technical/api-trace.txt
+++ b/Documentation/technical/api-trace.txt
@@ -28,7 +28,7 @@ static struct trace_key trace_foo = TRACE_KEY_INIT(FOO);
static void trace_print_foo(const char *message)
{
- trace_print_key(&trace_foo, message);
+ trace_printf_key(&trace_foo, "%s", message);
}
------------
+
@@ -95,3 +95,46 @@ for (;;) {
}
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/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index c6977bb..8b36343 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -526,7 +526,7 @@ Push Certificate
A push certificate begins with a set of header lines. After the
header and an empty line, the protocol commands follow, one per
-line. Note that the the trailing LF in push-cert PKT-LINEs is _not_
+line. Note that the trailing LF in push-cert PKT-LINEs is _not_
optional; it must be present.
Currently, the following header fields are defined:
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4e9450b..ae4f560 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.0
+DEF_VER=v2.9.0
LF='
'
diff --git a/Makefile b/Makefile
index 2742a69..de5a030 100644
--- a/Makefile
+++ b/Makefile
@@ -355,9 +355,6 @@ all::
#
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
#
-# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
-# cleanup the HMAC context with the older HMAC_cleanup function.
-#
# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
# compiles the following initialization:
#
@@ -378,13 +375,7 @@ GIT-VERSION-FILE: FORCE
# CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = -g -O2 -Wall
-LDFLAGS =
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
-STRIP ?= strip
-
-ifdef DEVELOPER
-CFLAGS += -Werror \
+DEVELOPER_CFLAGS = -Werror \
-Wdeclaration-after-statement \
-Wno-format-zero-length \
-Wold-style-definition \
@@ -393,7 +384,10 @@ CFLAGS += -Werror \
-Wstrict-prototypes \
-Wunused \
-Wvla
-endif
+LDFLAGS =
+ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+ALL_LDFLAGS = $(LDFLAGS)
+STRIP ?= strip
# Create as necessary, replace existing, make ranlib unneeded.
ARFLAGS = rcs
@@ -443,7 +437,6 @@ DIFF = diff
TAR = tar
FIND = find
INSTALL = install
-RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
XGETTEXT = xgettext
@@ -624,7 +617,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe
TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
TEST_PROGRAMS_NEED_X += test-wildmatch
-TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
+TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X))
# List built-in command $C whose implementation cmd_$C() is not in
# builtin/$C.o but is linked in as part of some other command.
@@ -955,6 +948,10 @@ include config.mak.uname
-include config.mak.autogen
-include config.mak
+ifdef DEVELOPER
+CFLAGS += $(DEVELOPER_CFLAGS)
+endif
+
ifndef sysconfdir
ifeq ($(prefix),/usr)
sysconfdir = /etc
@@ -1138,9 +1135,6 @@ ifndef NO_OPENSSL
ifdef NEEDS_CRYPTO_WITH_SSL
OPENSSL_LIBSSL += -lcrypto
endif
- ifdef NO_HMAC_CTX_CLEANUP
- BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
- endif
else
BASIC_CFLAGS += -DNO_OPENSSL
BLK_SHA1 = 1
@@ -1904,7 +1898,7 @@ VCSSVN_OBJS += vcs-svn/fast_export.o
VCSSVN_OBJS += vcs-svn/svndiff.o
VCSSVN_OBJS += vcs-svn/svndump.o
-TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS))
OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
$(XDIFF_OBJS) \
$(VCSSVN_OBJS) \
@@ -2069,7 +2063,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
--keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
-LOCALIZED_SH = $(SCRIPT_SH)
+LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
LOCALIZED_PERL = $(SCRIPT_PERL)
ifdef XGETTEXT_INCLUDE_TESTS
@@ -2211,7 +2205,7 @@ bin-wrappers/%: wrap-for-bin.sh
@mkdir -p bin-wrappers
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
- -e 's|@@PROG@@|$(@F)|' < $< > $@ && \
+ -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
chmod +x $@
# GNU make supports exporting all variables by "export" without parameters.
@@ -2231,25 +2225,25 @@ perf: all
.PHONY: test perf
-test-ctype$X: ctype.o
+t/helper/test-ctype$X: ctype.o
-test-date$X: date.o ctype.o
+t/helper/test-date$X: date.o ctype.o
-test-delta$X: diff-delta.o patch-delta.o
+t/helper/test-delta$X: diff-delta.o patch-delta.o
-test-line-buffer$X: vcs-svn/lib.a
+t/helper/test-line-buffer$X: vcs-svn/lib.a
-test-parse-options$X: parse-options.o parse-options-cb.o
+t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
-test-svn-fe$X: vcs-svn/lib.a
+t/helper/test-svn-fe$X: vcs-svn/lib.a
.PRECIOUS: $(TEST_OBJS)
-test-%$X: test-%.o GIT-LDFLAGS $(GITLIBS)
+t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
-check-sha1:: test-sha1$X
- ./test-sha1.sh
+check-sha1:: t/helper/test-sha1$X
+ t/helper/test-sha1.sh
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
@@ -2263,10 +2257,10 @@ sparse: $(SP_OBJ)
check: common-cmds.h
@if sparse; \
then \
- echo 2>&1 "Use 'make sparse' instead"; \
+ echo >&2 "Use 'make sparse' instead"; \
$(MAKE) --no-print-directory sparse; \
else \
- echo 2>&1 "Did you mean 'make test'?"; \
+ echo >&2 "Did you mean 'make test'?"; \
exit 1; \
fi
@@ -2396,31 +2390,25 @@ quick-install-html:
### Maintainer's dist rules
-git.spec: git.spec.in GIT-VERSION-FILE
- sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
- mv $@+ $@
-
GIT_TARNAME = git-$(GIT_VERSION)
-dist: git.spec git-archive$(X) configure
+dist: git-archive$(X) configure
./git-archive --format=tar \
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
@mkdir -p $(GIT_TARNAME)
- @cp git.spec configure $(GIT_TARNAME)
+ @cp configure $(GIT_TARNAME)
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
$(TAR) rf $(GIT_TARNAME).tar \
- $(GIT_TARNAME)/git.spec \
$(GIT_TARNAME)/configure \
$(GIT_TARNAME)/version \
$(GIT_TARNAME)/git-gui/version
@$(RM) -r $(GIT_TARNAME)
gzip -f -9 $(GIT_TARNAME).tar
-rpm: dist
- $(RPMBUILD) \
- --define "_source_filedigest_algorithm md5" \
- --define "_binary_filedigest_algorithm md5" \
- -ta $(GIT_TARNAME).tar.gz
+rpm::
+ @echo >&2 "Use distro packaged sources to run rpmbuild"
+ @false
+.PHONY: rpm
htmldocs = git-htmldocs-$(GIT_VERSION)
manpages = git-manpages-$(GIT_VERSION)
@@ -2456,8 +2444,8 @@ profile-clean:
$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
clean: profile-clean coverage-clean
- $(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
- $(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
+ $(RM) *.res
+ $(RM) $(OBJECTS)
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
@@ -2496,6 +2484,7 @@ ALL_COMMANDS += git-gui git-citool
.PHONY: check-docs
check-docs::
+ $(MAKE) -C Documentation lint-docs
@(for v in $(ALL_COMMANDS); \
do \
case "$$v" in \
diff --git a/README.md b/README.md
index d1ffbb6..bd8a918 100644
--- a/README.md
+++ b/README.md
@@ -17,14 +17,14 @@ including full documentation and Git related tools.
See [Documentation/gittutorial.txt][] to get started, then see
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and
-[Documentation/git-commandname.txt][] for documentation of each command.
+Documentation/git-<commandname>.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
-read with "man gittutorial" or "git help tutorial", and the
-documentation of each command with "man git-commandname" or "git help
-commandname".
+read with `man gittutorial` or `git help tutorial`, and the
+documentation of each command with `man git-<commandname>` or `git help
+<commandname>`.
CVS users may also want to read [Documentation/gitcvs-migration.txt][]
-("man gitcvs-migration" or "git help cvs-migration" if git is
+(`man gitcvs-migration` or `git help cvs-migration` if git is
installed).
The user discussion and development of Git take place on the Git
@@ -57,6 +57,5 @@ and the name as (depending on your mood):
[INSTALL]: INSTALL
[Documentation/gittutorial.txt]: Documentation/gittutorial.txt
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt
-[Documentation/git-commandname.txt]: Documentation/git-commandname.txt
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches
diff --git a/RelNotes b/RelNotes
index 7db3040..6660673 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.8.0.txt \ No newline at end of file
+Documentation/RelNotes/2.9.0.txt \ No newline at end of file
diff --git a/abspath.c b/abspath.c
index 5edb4e7..2825de8 100644
--- a/abspath.c
+++ b/abspath.c
@@ -167,7 +167,6 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
strbuf_add(&path, pfx, pfx_len);
strbuf_addstr(&path, arg);
#else
- char *p;
/* don't add prefix to absolute paths, but still replace '\' by '/' */
strbuf_reset(&path);
if (is_absolute_path(arg))
@@ -175,9 +174,7 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
else if (pfx_len)
strbuf_add(&path, pfx, pfx_len);
strbuf_addstr(&path, arg);
- for (p = path.buf + pfx_len; *p; p++)
- if (*p == '\\')
- *p = '/';
+ convert_slashes(path.buf + pfx_len);
#endif
return path.buf;
}
diff --git a/archive-tar.c b/archive-tar.c
index 501ca97..cb99df2 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -181,7 +181,7 @@ static void prepare_header(struct archiver_args *args,
memcpy(header->magic, "ustar", 6);
memcpy(header->version, "00", 2);
- snprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
+ xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
}
static int write_extended_header(struct archiver_args *args,
diff --git a/attr.c b/attr.c
index 6537a43..eec5d7d 100644
--- a/attr.c
+++ b/attr.c
@@ -122,7 +122,7 @@ struct pattern {
const char *pattern;
int patternlen;
int nowildcardlen;
- int flags; /* EXC_FLAG_* */
+ unsigned flags; /* EXC_FLAG_* */
};
/*
diff --git a/bisect.c b/bisect.c
index 7996c29..6d93edb 100644
--- a/bisect.c
+++ b/bisect.c
@@ -860,8 +860,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
/* Create file BISECT_ANCESTORS_OK. */
fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (fd < 0)
- warning("could not create file '%s': %s",
- filename, strerror(errno));
+ warning_errno("could not create file '%s'",
+ filename);
else
close(fd);
done:
@@ -910,8 +910,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
*read_good = "good";
return;
} else {
- die("could not read file '%s': %s", filename,
- strerror(errno));
+ die_errno("could not read file '%s'", filename);
}
} else {
strbuf_getline_lf(&str, fp);
diff --git a/branch.c b/branch.c
index c50ea42..a5a8dcb 100644
--- a/branch.c
+++ b/branch.c
@@ -334,13 +334,38 @@ void remove_branch_state(void)
unlink(git_path_squash_msg());
}
-void die_if_checked_out(const char *branch)
+void die_if_checked_out(const char *branch, int ignore_current_worktree)
{
- char *existing;
+ const struct worktree *wt;
- existing = find_shared_symref("HEAD", branch);
- if (existing) {
- skip_prefix(branch, "refs/heads/", &branch);
- die(_("'%s' is already checked out at '%s'"), branch, existing);
+ wt = find_shared_symref("HEAD", branch);
+ if (!wt || (ignore_current_worktree && wt->is_current))
+ return;
+ skip_prefix(branch, "refs/heads/", &branch);
+ die(_("'%s' is already checked out at '%s'"),
+ branch, wt->path);
+}
+
+int replace_each_worktree_head_symref(const char *oldref, const char *newref)
+{
+ int ret = 0;
+ struct worktree **worktrees = get_worktrees();
+ int i;
+
+ for (i = 0; worktrees[i]; i++) {
+ if (worktrees[i]->is_detached)
+ continue;
+ if (strcmp(oldref, worktrees[i]->head_ref))
+ continue;
+
+ if (set_worktree_head_symref(get_worktree_git_dir(worktrees[i]),
+ newref)) {
+ ret = -1;
+ error(_("HEAD of working tree %s is not updated"),
+ worktrees[i]->path);
+ }
}
+
+ free_worktrees(worktrees);
+ return ret;
}
diff --git a/branch.h b/branch.h
index 78ad438..b2f9649 100644
--- a/branch.h
+++ b/branch.h
@@ -58,6 +58,13 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name);
* worktree and die (with a message describing its checkout location) if
* it is.
*/
-extern void die_if_checked_out(const char *branch);
+extern void die_if_checked_out(const char *branch, int ignore_current_worktree);
+
+/*
+ * Update all per-worktree HEADs pointing at the old ref to point the new ref.
+ * This will be used when renaming a branch. Returns 0 if successful, non-zero
+ * otherwise.
+ */
+extern int replace_each_worktree_head_symref(const char *oldref, const char *newref);
#endif
diff --git a/builtin/am.c b/builtin/am.c
index d003939..3dfe70b 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -769,15 +769,15 @@ static int split_mail_conv(mail_conv_fn fn, struct am_state *state,
in = fopen(*paths, "r");
if (!in)
- return error(_("could not open '%s' for reading: %s"),
- *paths, strerror(errno));
+ return error_errno(_("could not open '%s' for reading"),
+ *paths);
mail = mkpath("%s/%0*d", state->dir, state->prec, i + 1);
out = fopen(mail, "w");
if (!out)
- return error(_("could not open '%s' for writing: %s"),
- mail, strerror(errno));
+ return error_errno(_("could not open '%s' for writing"),
+ mail);
ret = fn(out, in, keep_cr);
@@ -857,8 +857,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
fp = fopen(*paths, "r");
if (!fp)
- return error(_("could not open '%s' for reading: %s"), *paths,
- strerror(errno));
+ return error_errno(_("could not open '%s' for reading"), *paths);
while (!strbuf_getline_lf(&sb, fp)) {
if (*sb.buf == '#')
diff --git a/builtin/apply.c b/builtin/apply.c
index 42c610e..c770d7d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -442,7 +442,7 @@ static int is_dev_null(const char *str)
#define TERM_SPACE 1
#define TERM_TAB 2
-static int name_terminate(const char *name, int namelen, int c, int terminate)
+static int name_terminate(int c, int terminate)
{
if (c == ' ' && !(terminate & TERM_SPACE))
return 0;
@@ -671,7 +671,7 @@ static char *find_name_common(const char *line, const char *def,
if (!end && isspace(c)) {
if (c == '\n')
break;
- if (name_terminate(start, line-start, c, terminate))
+ if (name_terminate(c, terminate))
break;
}
line++;
@@ -931,22 +931,19 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
return find_name(line, NULL, p_value, TERM_TAB);
if (orig_name) {
- int len;
- const char *name;
+ int len = strlen(orig_name);
char *another;
- name = orig_name;
- len = strlen(name);
if (isnull)
- die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr);
+ die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
+ orig_name, linenr);
another = find_name(line, NULL, p_value, TERM_TAB);
- if (!another || memcmp(another, name, len + 1))
+ if (!another || memcmp(another, orig_name, len + 1))
die((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") :
_("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
free(another);
return orig_name;
- }
- else {
+ } else {
/* expect "/dev/null" */
if (memcmp("/dev/null", line, 9) || line[9] != '\n')
die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr);
@@ -956,21 +953,15 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
static int gitdiff_oldname(const char *line, struct patch *patch)
{
- char *orig = patch->old_name;
patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
DIFF_OLD_NAME);
- if (orig != patch->old_name)
- free(orig);
return 0;
}
static int gitdiff_newname(const char *line, struct patch *patch)
{
- char *orig = patch->new_name;
patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
DIFF_NEW_NAME);
- if (orig != patch->new_name)
- free(orig);
return 0;
}
@@ -1872,6 +1863,11 @@ static struct fragment *parse_binary_hunk(char **buf_p,
return NULL;
}
+/*
+ * Returns:
+ * -1 in case of error,
+ * the length of the parsed binary patch otherwise
+ */
static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
{
/*
@@ -2017,6 +2013,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
linenr++;
used = parse_binary(buffer + hd + llen,
size - hd - llen, patch);
+ if (used < 0)
+ return -1;
if (used)
patchsize = used + llen;
else
@@ -4373,8 +4371,10 @@ static int apply_patch(int fd, const char *filename, int options)
patch->inaccurate_eof = !!(options & INACCURATE_EOF);
patch->recount = !!(options & RECOUNT);
nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
- if (nr < 0)
+ if (nr < 0) {
+ free_patch(patch);
break;
+ }
if (apply_in_reverse)
reverse_patches(patch);
if (use_patch(patch)) {
@@ -4383,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options)
listp = &patch->next;
}
else {
+ if (apply_verbosely)
+ say_patch_name(stderr, _("Skipped patch '%s'."), patch);
free_patch(patch);
skipped_patch++;
}
diff --git a/builtin/blame.c b/builtin/blame.c
index e982fb8..21f42b0 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2307,6 +2307,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
unsigned mode;
struct strbuf msg = STRBUF_INIT;
+ read_cache();
time(&now);
commit = alloc_commit_node();
commit->object.parsed = 1;
diff --git a/builtin/branch.c b/builtin/branch.c
index 7b45b6b..2ecde53 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -20,6 +20,7 @@
#include "utf8.h"
#include "wt-status.h"
#include "ref-filter.h"
+#include "worktree.h"
static const char * const builtin_branch_usage[] = {
N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
@@ -215,16 +216,21 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
int flags = 0;
strbuf_branchname(&bname, argv[i]);
- if (kinds == FILTER_REFS_BRANCHES && !strcmp(head, bname.buf)) {
- error(_("Cannot delete the branch '%s' "
- "which you are currently on."), bname.buf);
- ret = 1;
- continue;
- }
-
free(name);
-
name = mkpathdup(fmt, bname.buf);
+
+ if (kinds == FILTER_REFS_BRANCHES) {
+ const struct worktree *wt =
+ find_shared_symref("HEAD", name);
+ if (wt) {
+ error(_("Cannot delete branch '%s' "
+ "checked out at '%s'"),
+ bname.buf, wt->path);
+ ret = 1;
+ continue;
+ }
+ }
+
target = resolve_ref_unsafe(name,
RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
@@ -369,12 +375,14 @@ static char *get_head_description(void)
strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
state.branch);
else if (state.detached_from) {
- /* TRANSLATORS: make sure these match _("HEAD detached at ")
- and _("HEAD detached from ") in wt-status.c */
if (state.detached_at)
+ /* TRANSLATORS: make sure this matches
+ "HEAD detached at " in wt-status.c */
strbuf_addf(&desc, _("(HEAD detached at %s)"),
state.detached_from);
else
+ /* TRANSLATORS: make sure this matches
+ "HEAD detached from " in wt-status.c */
strbuf_addf(&desc, _("(HEAD detached from %s)"),
state.detached_from);
}
@@ -393,22 +401,25 @@ static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
int current = 0;
int color;
struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
- const char *prefix = "";
+ const char *prefix_to_show = "";
+ const char *prefix_to_skip = NULL;
const char *desc = item->refname;
char *to_free = NULL;
switch (item->kind) {
case FILTER_REFS_BRANCHES:
- skip_prefix(desc, "refs/heads/", &desc);
+ prefix_to_skip = "refs/heads/";
+ skip_prefix(desc, prefix_to_skip, &desc);
if (!filter->detached && !strcmp(desc, head))
current = 1;
else
color = BRANCH_COLOR_LOCAL;
break;
case FILTER_REFS_REMOTES:
- skip_prefix(desc, "refs/remotes/", &desc);
+ prefix_to_skip = "refs/remotes/";
+ skip_prefix(desc, prefix_to_skip, &desc);
color = BRANCH_COLOR_REMOTE;
- prefix = remote_prefix;
+ prefix_to_show = remote_prefix;
break;
case FILTER_REFS_DETACHED_HEAD:
desc = to_free = get_head_description();
@@ -425,7 +436,7 @@ static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
color = BRANCH_COLOR_CURRENT;
}
- strbuf_addf(&name, "%s%s", prefix, desc);
+ strbuf_addf(&name, "%s%s", prefix_to_show, desc);
if (filter->verbose) {
int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf);
strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
@@ -436,8 +447,10 @@ static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
name.buf, branch_get_color(BRANCH_COLOR_RESET));
if (item->symref) {
- skip_prefix(item->symref, "refs/remotes/", &desc);
- strbuf_addf(&out, " -> %s", desc);
+ const char *symref = item->symref;
+ if (prefix_to_skip)
+ skip_prefix(symref, prefix_to_skip, &symref);
+ strbuf_addf(&out, " -> %s", symref);
}
else if (filter->verbose)
/* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */
@@ -513,6 +526,29 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
ref_array_clear(&array);
}
+static void reject_rebase_or_bisect_branch(const char *target)
+{
+ struct worktree **worktrees = get_worktrees();
+ int i;
+
+ for (i = 0; worktrees[i]; i++) {
+ struct worktree *wt = worktrees[i];
+
+ if (!wt->is_detached)
+ continue;
+
+ if (is_worktree_being_rebased(wt, target))
+ die(_("Branch %s is being rebased at %s"),
+ target, wt->path);
+
+ if (is_worktree_being_bisected(wt, target))
+ die(_("Branch %s is being bisected at %s"),
+ target, wt->path);
+ }
+
+ free_worktrees(worktrees);
+}
+
static void rename_branch(const char *oldname, const char *newname, int force)
{
struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
@@ -542,6 +578,8 @@ static void rename_branch(const char *oldname, const char *newname, int force)
validate_new_branchname(newname, &newref, force, clobber_head_ok);
+ reject_rebase_or_bisect_branch(oldref.buf);
+
strbuf_addf(&logmsg, "Branch: renamed %s to %s",
oldref.buf, newref.buf);
@@ -552,8 +590,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
if (recovery)
warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
- /* no need to pass logmsg here as HEAD didn't really move */
- if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
+ if (replace_each_worktree_head_symref(oldref.buf, newref.buf))
die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
@@ -583,8 +620,7 @@ static int edit_branch_description(const char *branch_name)
branch_name, comment_line_char);
if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
strbuf_release(&buf);
- return error(_("could not write branch description template: %s"),
- strerror(errno));
+ return error_errno(_("could not write branch description template"));
}
strbuf_reset(&buf);
if (launch_editor(git_path(edit_description), &buf, NULL)) {
@@ -620,7 +656,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
BRANCH_TRACK_EXPLICIT),
OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
BRANCH_TRACK_OVERRIDE),
- OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
+ OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
OPT_BOOL(0, "unset-upstream", &unset_upstream, "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"),
@@ -828,8 +864,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
!branch_existed && remote_tracking) {
fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
- fprintf(stderr, _(" git branch -d %s\n"), branch->name);
- fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name);
+ fprintf(stderr, " git branch -d %s\n", branch->name);
+ fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name);
}
} else
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 54db118..618103f 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -154,6 +154,13 @@ struct expand_data {
* elements above, so you can retrieve the response from there.
*/
struct object_info info;
+
+ /*
+ * This flag will be true if the requested batch format and options
+ * don't require us to call sha1_object_info, which can then be
+ * optimized out.
+ */
+ unsigned skip_object_info : 1;
};
static int is_atom(const char *atom, const char *s, int slen)
@@ -258,7 +265,8 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt,
{
struct strbuf buf = STRBUF_INIT;
- if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
+ if (!data->skip_object_info &&
+ sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
printf("%s missing\n", obj_name ? obj_name : sha1_to_hex(data->sha1));
fflush(stdout);
return;
@@ -369,6 +377,13 @@ static int batch_objects(struct batch_options *opt)
strbuf_expand(&buf, opt->format, expand_format, &data);
data.mark_query = 0;
+ if (opt->all_objects) {
+ struct object_info empty;
+ memset(&empty, 0, sizeof(empty));
+ if (!memcmp(&data.info, &empty, sizeof(empty)))
+ data.skip_object_info = 1;
+ }
+
/*
* If we are printing out the object, then always fill in the type,
* since we will want to decide whether or not to stream.
@@ -489,6 +504,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
git_config(git_cat_file_config, NULL);
+ batch.buffer_output = -1;
argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
if (opt) {
@@ -512,6 +528,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
usage_with_options(cat_file_usage, options);
}
+ if (batch.buffer_output < 0)
+ batch.buffer_output = batch.all_objects;
+
if (batch.enabled)
return batch_objects(&batch);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index efcbd8f..3398c61 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -242,7 +242,6 @@ static int checkout_paths(const struct checkout_opts *opts,
struct checkout state;
static char *ps_matched;
unsigned char rev[20];
- int flag;
struct commit *head;
int errs = 0;
struct lock_file *lock_file;
@@ -375,7 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
- read_ref_full("HEAD", 0, rev, &flag);
+ read_ref_full("HEAD", 0, rev, NULL);
head = lookup_commit_reference_gently(rev, 1);
errs |= post_checkout_hook(head, head, 0);
@@ -1111,7 +1110,7 @@ static int checkout_branch(struct checkout_opts *opts,
char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
if (head_ref &&
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
- die_if_checked_out(new->path);
+ die_if_checked_out(new->path, 1);
free(head_ref);
}
diff --git a/builtin/clone.c b/builtin/clone.c
index 6616392..5f867e6 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -40,6 +40,7 @@ static const char * const builtin_clone_usage[] = {
static int option_no_checkout, option_bare, option_mirror, option_single_branch = -1;
static int option_local = -1, option_no_hardlinks, option_shared, option_recursive;
+static int option_shallow_submodules = -1;
static char *option_template, *option_depth;
static char *option_origin = NULL;
static char *option_branch = NULL;
@@ -51,6 +52,7 @@ static enum transport_family family;
static struct string_list option_config;
static struct string_list option_reference;
static int option_dissociate;
+static int max_jobs = -1;
static struct option builtin_clone_options[] = {
OPT__VERBOSITY(&option_verbosity),
@@ -73,6 +75,8 @@ static struct option builtin_clone_options[] = {
N_("initialize submodules in the clone")),
OPT_BOOL(0, "recurse-submodules", &option_recursive,
N_("initialize submodules in the clone")),
+ OPT_INTEGER('j', "jobs", &max_jobs,
+ N_("number of submodules cloned in parallel")),
OPT_STRING(0, "template", &option_template, N_("template-directory"),
N_("directory from which templates will be used")),
OPT_STRING_LIST(0, "reference", &option_reference, N_("repo"),
@@ -89,6 +93,8 @@ static struct option builtin_clone_options[] = {
N_("create a shallow clone of that depth")),
OPT_BOOL(0, "single-branch", &option_single_branch,
N_("clone only one branch, HEAD or --branch")),
+ OPT_BOOL(0, "shallow-submodules", &option_shallow_submodules,
+ N_("any cloned submodules will be shallow")),
OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
N_("separate git dir from working tree")),
OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
@@ -100,10 +106,6 @@ static struct option builtin_clone_options[] = {
OPT_END()
};
-static const char *argv_submodule[] = {
- "submodule", "update", "--init", "--recursive", NULL
-};
-
static const char *get_repo_path_1(struct strbuf *path, int *is_bundle)
{
static char *suffix[] = { "/.git", "", ".git/.git", ".git" };
@@ -732,8 +734,20 @@ static int checkout(void)
err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
sha1_to_hex(sha1), "1", NULL);
- if (!err && option_recursive)
- err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
+ if (!err && option_recursive) {
+ struct argv_array args = ARGV_ARRAY_INIT;
+ argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL);
+
+ if (option_shallow_submodules == 1
+ || (option_shallow_submodules == -1 && option_depth))
+ argv_array_push(&args, "--depth=1");
+
+ if (max_jobs != -1)
+ argv_array_pushf(&args, "--jobs=%d", max_jobs);
+
+ err = run_command_v_opt(args.argv, RUN_GIT_CMD);
+ argv_array_clear(&args);
+ }
return err;
}
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 3feeffe..8a674bc 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -33,10 +33,6 @@ static int commit_tree_config(const char *var, const char *value, void *cb)
int status = git_gpg_config(var, value, NULL);
if (status)
return status;
- if (!strcmp(var, "commit.gpgsign")) {
- sign_commit = git_config_bool(var, value) ? "" : NULL;
- return 0;
- }
return git_default_config(var, value, cb);
}
diff --git a/builtin/commit.c b/builtin/commit.c
index b3bd2d4..443ff91 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -114,6 +114,7 @@ static char *fixup_message, *squash_message;
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 char *untracked_files_arg, *force_date, *ignore_submodule_arg;
static char *sign_commit;
@@ -186,6 +187,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn)
gitmodules_config();
git_config(fn, s);
determine_whence(s);
+ init_diff_ui_defaults();
s->hints = advice_status_hints; /* must come after git_config() */
}
@@ -694,7 +696,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
}
}
- if (message.len) {
+ if (have_option_m) {
strbuf_addbuf(&sb, &message);
hook_arg1 = "message";
} else if (logfile && !strcmp(logfile, "-")) {
@@ -726,9 +728,18 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
&sb, &ctx);
hook_arg1 = "message";
} else if (!stat(git_path_merge_msg(), &statbuf)) {
+ /*
+ * prepend SQUASH_MSG here if it exists and a
+ * "merge --squash" was originally performed
+ */
+ if (!stat(git_path_squash_msg(), &statbuf)) {
+ if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
+ die_errno(_("could not read SQUASH_MSG"));
+ hook_arg1 = "squash";
+ } else
+ hook_arg1 = "merge";
if (strbuf_read_file(&sb, git_path_merge_msg(), 0) < 0)
die_errno(_("could not read MERGE_MSG"));
- hook_arg1 = "merge";
} else if (!stat(git_path_squash_msg(), &statbuf)) {
if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
die_errno(_("could not read SQUASH_MSG"));
@@ -1162,9 +1173,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
f++;
if (f > 1)
die(_("Only one of -c/-C/-F/--fixup can be used."));
- if (message.len && f > 0)
+ if (have_option_m && f > 0)
die((_("Option -m cannot be combined with -c/-C/-F/--fixup.")));
- if (f || message.len)
+ if (f || have_option_m)
template_file = NULL;
if (edit_message)
use_message = edit_message;
@@ -1505,6 +1516,11 @@ static int git_commit_config(const char *k, const char *v, void *cb)
sign_commit = git_config_bool(k, v) ? "" : NULL;
return 0;
}
+ if (!strcmp(k, "commit.verbose")) {
+ int is_bool;
+ config_commit_verbose = git_config_bool_or_int(k, v, &is_bool);
+ return 0;
+ }
status = git_gpg_config(k, v, NULL);
if (status)
@@ -1651,9 +1667,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
if (parse_commit(current_head))
die(_("could not parse HEAD commit"));
}
+ verbose = -1; /* unspecified */
argc = parse_and_validate_options(argc, argv, builtin_commit_options,
builtin_commit_usage,
prefix, current_head, &s);
+ if (verbose == -1)
+ verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
+
if (dry_run)
return dry_run_commit(argc, argv, prefix, current_head, &s);
index_file = prepare_index(argc, argv, prefix, current_head, 0);
diff --git a/builtin/config.c b/builtin/config.c
index ca9f834..1d7c6ef 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -417,6 +417,7 @@ static int urlmatch_collect_fn(const char *var, const char *value, void *cb)
static int get_urlmatch(const char *var, const char *url)
{
+ int ret;
char *section_tail;
struct string_list_item *item;
struct urlmatch_config config = { STRING_LIST_INIT_DUP };
@@ -443,6 +444,8 @@ static int get_urlmatch(const char *var, const char *url)
git_config_with_options(urlmatch_config_entry, &config,
&given_config_source, respect_includes);
+ ret = !values.nr;
+
for_each_string_list_item(item, &values) {
struct urlmatch_current_candidate_value *matched = item->util;
struct strbuf buf = STRBUF_INIT;
@@ -459,7 +462,7 @@ static int get_urlmatch(const char *var, const char *url)
free(config.url.url);
free((void *)config.section);
- return 0;
+ return ret;
}
static char *default_user_config(void)
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 8ed2eb8..15c61fd 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -24,6 +24,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
rev.abbrev = 0;
+ precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, &rev, NULL);
while (1 < argc && argv[1][0] == '-') {
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index d979824..1af373d 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -21,6 +21,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
rev.abbrev = 0;
+ precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, &rev, NULL);
for (i = 1; i < argc; i++) {
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 2a12b81..806dd7a 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -114,6 +114,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
opt->disable_stdin = 1;
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.tweak = diff_tree_tweak_rev;
+
+ precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, opt, &s_r_opt);
while (--argc > 0) {
diff --git a/builtin/diff.c b/builtin/diff.c
index 52c98a9..b7a9405 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -318,7 +318,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
if (!no_index)
gitmodules_config();
+ init_diff_ui_defaults();
git_config(git_diff_ui_config, NULL);
+ precompose_argv(argc, argv);
init_revisions(&rev, prefix);
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 79a611f..bfd0be4 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -16,10 +16,20 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
struct ref *ref;
struct object_id oid;
- if (!get_oid_hex(name, &oid) && name[GIT_SHA1_HEXSZ] == ' ')
- name += GIT_SHA1_HEXSZ + 1;
- else
+ if (!get_oid_hex(name, &oid)) {
+ if (name[GIT_SHA1_HEXSZ] == ' ') {
+ /* <sha1> <ref>, find refname */
+ name += GIT_SHA1_HEXSZ + 1;
+ } else if (name[GIT_SHA1_HEXSZ] == '\0') {
+ ; /* <sha1>, leave sha1 as name */
+ } else {
+ /* <ref>, clear cruft from oid */
+ oidclr(&oid);
+ }
+ } else {
+ /* <ref>, clear cruft from get_oid_hex */
oidclr(&oid);
+ }
ref = alloc_ref(name);
oidcpy(&ref->old_oid, &oid);
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e4639d8..1582ca7 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -37,7 +37,7 @@ static int prune = -1; /* unspecified */
static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
static int tags = TAGS_DEFAULT, unshallow, update_shallow;
-static int max_children = 1;
+static int max_children = -1;
static enum transport_family family;
static const char *depth;
static const char *upload_pack;
@@ -607,7 +607,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
fp = fopen(filename, "a");
if (!fp)
- return error(_("cannot open %s: %s\n"), filename, strerror(errno));
+ return error_errno(_("cannot open %s"), filename);
if (raw_url)
url = transport_anonymize_url(raw_url);
@@ -848,7 +848,7 @@ static int truncate_fetch_head(void)
FILE *fp = fopen_for_writing(filename);
if (!fp)
- return error(_("cannot open %s: %s\n"), filename, strerror(errno));
+ return error_errno(_("cannot open %s"), filename);
fclose(fp);
return 0;
}
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 55eac75..3f27456 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -493,13 +493,12 @@ static void fsck_object_dir(const char *path)
static int fsck_head_link(void)
{
- int flag;
int null_is_error = 0;
if (verbose)
fprintf(stderr, "Checking HEAD link\n");
- head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, &flag);
+ head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, NULL);
if (!head_points_at) {
errors_found |= ERROR_REFS;
return error("Invalid HEAD");
diff --git a/builtin/grep.c b/builtin/grep.c
index aa7435f..462e607 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -438,7 +438,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
strbuf_add(base, entry.path, te_len);
if (S_ISREG(entry.mode)) {
- hit |= grep_sha1(opt, entry.sha1, base->buf, tn_len,
+ hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len,
check_attr ? base->buf + tn_len : NULL);
}
else if (S_ISDIR(entry.mode)) {
@@ -447,10 +447,10 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
void *data;
unsigned long size;
- data = lock_and_read_sha1_file(entry.sha1, &type, &size);
+ data = lock_and_read_sha1_file(entry.oid->hash, &type, &size);
if (!data)
die(_("unable to read tree (%s)"),
- sha1_to_hex(entry.sha1));
+ oid_to_hex(entry.oid));
strbuf_addch(base, '/');
init_tree_desc(&sub, data, size);
@@ -522,12 +522,14 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
}
static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
- int exc_std)
+ int exc_std, int use_index)
{
struct dir_struct dir;
int i, hit = 0;
memset(&dir, 0, sizeof(dir));
+ if (!use_index)
+ dir.flags |= DIR_NO_GITLINKS;
if (exc_std)
setup_standard_excludes(&dir);
@@ -902,7 +904,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
if (list.nr)
die(_("--no-index or --untracked cannot be used with revs."));
- hit = grep_directory(&opt, &pathspec, use_exclude);
+ hit = grep_directory(&opt, &pathspec, use_exclude, use_index);
} else if (0 <= opt_exclude) {
die(_("--[no-]exclude-standard cannot be used for tracked contents."));
} else if (!list.nr) {
diff --git a/builtin/help.c b/builtin/help.c
index 3c55ce4..8848013 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -127,7 +127,7 @@ static void exec_woman_emacs(const char *path, const char *page)
path = "emacsclient";
strbuf_addf(&man_page, "(woman \"%s\")", page);
execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL);
- warning(_("failed to exec '%s': %s"), path, strerror(errno));
+ warning_errno(_("failed to exec '%s'"), path);
}
}
@@ -148,7 +148,7 @@ static void exec_man_konqueror(const char *path, const char *page)
path = "kfmclient";
strbuf_addf(&man_page, "man:%s(1)", page);
execlp(path, filename, "newTab", man_page.buf, (char *)NULL);
- warning(_("failed to exec '%s': %s"), path, strerror(errno));
+ warning_errno(_("failed to exec '%s'"), path);
}
}
@@ -157,7 +157,7 @@ static void exec_man_man(const char *path, const char *page)
if (!path)
path = "man";
execlp(path, "man", page, (char *)NULL);
- warning(_("failed to exec '%s': %s"), path, strerror(errno));
+ warning_errno(_("failed to exec '%s'"), path);
}
static void exec_man_cmd(const char *cmd, const char *page)
@@ -165,7 +165,7 @@ static void exec_man_cmd(const char *cmd, const char *page)
struct strbuf shell_cmd = STRBUF_INIT;
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
- warning(_("failed to exec '%s': %s"), cmd, strerror(errno));
+ warning(_("failed to exec '%s'"), cmd);
}
static void add_man_viewer(const char *name)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 4524519..e8c71fc 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1250,7 +1250,9 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
nr_unresolved * sizeof(*objects));
f = sha1fd(output_fd, curr_pack);
fix_unresolved_deltas(f);
- strbuf_addf(&msg, _("completed with %d local objects"),
+ strbuf_addf(&msg, Q_("completed with %d local object",
+ "completed with %d local objects",
+ nr_objects - nr_objects_initial),
nr_objects - nr_objects_initial);
stop_progress_msg(&progress, msg.buf);
strbuf_release(&msg);
@@ -1599,6 +1601,18 @@ static void show_pack_info(int stat_only)
}
}
+static const char *derive_filename(const char *pack_name, const char *suffix,
+ struct strbuf *buf)
+{
+ size_t len;
+ if (!strip_suffix(pack_name, ".pack", &len))
+ die(_("packfile name '%s' does not end with '.pack'"),
+ pack_name);
+ strbuf_add(buf, pack_name, len);
+ strbuf_addstr(buf, suffix);
+ return buf->buf;
+}
+
int cmd_index_pack(int argc, const char **argv, const char *prefix)
{
int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
@@ -1707,24 +1721,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
usage(index_pack_usage);
if (fix_thin_pack && !from_stdin)
die(_("--fix-thin cannot be used without --stdin"));
- if (!index_name && pack_name) {
- size_t len;
- if (!strip_suffix(pack_name, ".pack", &len))
- die(_("packfile name '%s' does not end with '.pack'"),
- pack_name);
- strbuf_add(&index_name_buf, pack_name, len);
- strbuf_addstr(&index_name_buf, ".idx");
- index_name = index_name_buf.buf;
- }
- if (keep_msg && !keep_name && pack_name) {
- size_t len;
- if (!strip_suffix(pack_name, ".pack", &len))
- die(_("packfile name '%s' does not end with '.pack'"),
- pack_name);
- strbuf_add(&keep_name_buf, pack_name, len);
- strbuf_addstr(&keep_name_buf, ".idx");
- keep_name = keep_name_buf.buf;
- }
+ if (!index_name && pack_name)
+ index_name = derive_filename(pack_name, ".idx", &index_name_buf);
+ if (keep_msg && !keep_name && pack_name)
+ keep_name = derive_filename(pack_name, ".keep", &keep_name_buf);
+
if (verify) {
if (!index_name)
die(_("--verify with no packfile name given"));
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 6223b7d..b2d8d40 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -95,6 +95,8 @@ static void copy_templates(const char *template_dir)
struct strbuf path = STRBUF_INIT;
struct strbuf template_path = STRBUF_INIT;
size_t template_len;
+ struct repository_format template_format;
+ struct strbuf err = STRBUF_INIT;
DIR *dir;
char *to_free = NULL;
@@ -121,17 +123,18 @@ static void copy_templates(const char *template_dir)
/* Make sure that template is from the correct vintage */
strbuf_addstr(&template_path, "config");
- repository_format_version = 0;
- git_config_from_file(check_repository_format_version,
- template_path.buf, NULL);
+ read_repository_format(&template_format, template_path.buf);
strbuf_setlen(&template_path, template_len);
- if (repository_format_version &&
- repository_format_version != GIT_REPO_VERSION) {
- warning(_("not copying templates of "
- "a wrong format version %d from '%s'"),
- repository_format_version,
- template_dir);
+ /*
+ * No mention of version at all is OK, but anything else should be
+ * verified.
+ */
+ if (template_format.version >= 0 &&
+ verify_repository_format(&template_format, &err) < 0) {
+ warning(_("not copying templates from '%s': %s"),
+ template_dir, err.buf);
+ strbuf_release(&err);
goto close_free_return;
}
@@ -199,13 +202,13 @@ static int create_default_files(const char *template_path)
/* reading existing config may have overwrote it */
if (init_shared_repository != -1)
- shared_repository = init_shared_repository;
+ set_shared_repository(init_shared_repository);
/*
* We would have created the above under user's umask -- under
* shared-repository settings, we would need to fix them up.
*/
- if (shared_repository) {
+ if (get_shared_repository()) {
adjust_shared_perm(get_git_dir());
adjust_shared_perm(git_path_buf(&buf, "refs"));
adjust_shared_perm(git_path_buf(&buf, "refs/heads"));
@@ -322,6 +325,7 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,
set_git_dir(real_path(git_dir));
git_link = NULL;
}
+ startup_info->have_repository = 1;
return 0;
}
@@ -369,7 +373,7 @@ int init_db(const char *template_dir, unsigned int flags)
create_object_directory();
- if (shared_repository) {
+ if (get_shared_repository()) {
char buf[10];
/* We do not spell "group" and such, so that
* the configuration can be read by older version
@@ -377,12 +381,12 @@ int init_db(const char *template_dir, unsigned int flags)
* and compatibility values for PERM_GROUP and
* PERM_EVERYBODY.
*/
- if (shared_repository < 0)
+ if (get_shared_repository() < 0)
/* force to the mode value */
- xsnprintf(buf, sizeof(buf), "0%o", -shared_repository);
- else if (shared_repository == PERM_GROUP)
+ xsnprintf(buf, sizeof(buf), "0%o", -get_shared_repository());
+ else if (get_shared_repository() == PERM_GROUP)
xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_GROUP);
- else if (shared_repository == PERM_EVERYBODY)
+ else if (get_shared_repository() == PERM_EVERYBODY)
xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
else
die("BUG: invalid value for shared_repository");
@@ -398,7 +402,7 @@ int init_db(const char *template_dir, unsigned int flags)
"", and the last '%s%s' is the verbatim directory name. */
printf(_("%s%s Git repository in %s%s\n"),
reinit ? _("Reinitialized existing") : _("Initialized empty"),
- shared_repository ? _(" shared") : "",
+ get_shared_repository() ? _(" shared") : "",
git_dir, len && git_dir[len-1] != '/' ? "/" : "");
}
@@ -493,8 +497,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
* and we know shared_repository should always be 0;
* but just in case we play safe.
*/
- saved = shared_repository;
- shared_repository = 0;
+ saved = get_shared_repository();
+ set_shared_repository(0);
switch (safe_create_leading_directories_const(argv[0])) {
case SCLD_OK:
case SCLD_PERMS:
@@ -506,7 +510,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
die_errno(_("cannot mkdir %s"), argv[0]);
break;
}
- shared_repository = saved;
+ set_shared_repository(saved);
if (mkdir(argv[0], 0777) < 0)
die_errno(_("cannot mkdir %s"), argv[0]);
mkdir_tried = 1;
@@ -524,7 +528,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
}
if (init_shared_repository != -1)
- shared_repository = init_shared_repository;
+ set_shared_repository(init_shared_repository);
/*
* GIT_WORK_TREE makes sense only in conjunction with GIT_DIR
diff --git a/builtin/log.c b/builtin/log.c
index 0d738d6..099f4f7 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -100,6 +100,12 @@ static int log_line_range_callback(const struct option *option, const char *arg,
return 0;
}
+static void init_log_defaults(void)
+{
+ init_grep_defaults();
+ init_diff_ui_defaults();
+}
+
static void cmd_log_init_defaults(struct rev_info *rev)
{
if (fmt_pretty)
@@ -416,7 +422,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
struct rev_info rev;
struct setup_revision_opt opt;
- init_grep_defaults();
+ init_log_defaults();
git_config(git_log_config, NULL);
init_revisions(&rev, prefix);
@@ -527,7 +533,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
struct pathspec match_all;
int i, count, ret = 0;
- init_grep_defaults();
+ init_log_defaults();
git_config(git_log_config, NULL);
memset(&match_all, 0, sizeof(match_all));
@@ -608,7 +614,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
struct rev_info rev;
struct setup_revision_opt opt;
- init_grep_defaults();
+ init_log_defaults();
git_config(git_log_config, NULL);
init_revisions(&rev, prefix);
@@ -647,7 +653,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
struct rev_info rev;
struct setup_revision_opt opt;
- init_grep_defaults();
+ init_log_defaults();
git_config(git_log_config, NULL);
init_revisions(&rev, prefix);
@@ -696,6 +702,7 @@ static void add_header(const char *value)
#define THREAD_DEEP 2
static int thread;
static int do_signoff;
+static int base_auto;
static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
@@ -780,6 +787,10 @@ static int git_format_config(const char *var, const char *value, void *cb)
}
if (!strcmp(var, "format.outputdirectory"))
return git_config_string(&config_output_directory, var, value);
+ if (!strcmp(var, "format.useautobase")) {
+ base_auto = git_config_bool(var, value);
+ return 0;
+ }
return git_log_config(var, value, cb);
}
@@ -1185,6 +1196,155 @@ static int from_callback(const struct option *opt, const char *arg, int unset)
return 0;
}
+struct base_tree_info {
+ struct object_id base_commit;
+ int nr_patch_id, alloc_patch_id;
+ struct object_id *patch_id;
+};
+
+static struct commit *get_base_commit(const char *base_commit,
+ struct commit **list,
+ int total)
+{
+ struct commit *base = NULL;
+ struct commit **rev;
+ int i = 0, rev_nr = 0;
+
+ if (base_commit && strcmp(base_commit, "auto")) {
+ 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) {
+ struct branch *curr_branch = branch_get(NULL);
+ const char *upstream = branch_get_upstream(curr_branch, NULL);
+ if (upstream) {
+ struct commit_list *base_list;
+ struct commit *commit;
+ unsigned char sha1[20];
+
+ if (get_sha1(upstream, sha1))
+ die(_("Failed to resolve '%s' as a valid ref."), upstream);
+ commit = lookup_commit_or_die(sha1, "upstream base");
+ base_list = get_merge_bases_many(commit, total, list);
+ /* There should be one and only one merge base. */
+ if (!base_list || base_list->next)
+ die(_("Could not find exact merge base."));
+ base = base_list->item;
+ free_commit_list(base_list);
+ } else {
+ die(_("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."));
+ }
+ }
+
+ ALLOC_ARRAY(rev, total);
+ for (i = 0; i < total; i++)
+ rev[i] = list[i];
+
+ rev_nr = total;
+ /*
+ * Get merge base through pair-wise computations
+ * and store it in rev[0].
+ */
+ while (rev_nr > 1) {
+ for (i = 0; i < rev_nr / 2; i++) {
+ struct commit_list *merge_base;
+ merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
+ if (!merge_base || merge_base->next)
+ die(_("Failed to find exact merge base"));
+
+ rev[i] = merge_base->item;
+ }
+
+ if (rev_nr % 2)
+ rev[i] = rev[2 * i];
+ rev_nr = (rev_nr + 1) / 2;
+ }
+
+ if (!in_merge_bases(base, rev[0]))
+ die(_("base commit should be the ancestor of revision list"));
+
+ for (i = 0; i < total; i++) {
+ if (base == list[i])
+ die(_("base commit shouldn't be in revision list"));
+ }
+
+ free(rev);
+ return base;
+}
+
+static void prepare_bases(struct base_tree_info *bases,
+ struct commit *base,
+ struct commit **list,
+ int total)
+{
+ struct commit *commit;
+ struct rev_info revs;
+ struct diff_options diffopt;
+ int i;
+
+ if (!base)
+ return;
+
+ diff_setup(&diffopt);
+ DIFF_OPT_SET(&diffopt, RECURSIVE);
+ diff_setup_done(&diffopt);
+
+ oidcpy(&bases->base_commit, &base->object.oid);
+
+ init_revisions(&revs, NULL);
+ revs.max_parents = 1;
+ revs.topo_order = 1;
+ for (i = 0; i < total; i++) {
+ list[i]->object.flags &= ~UNINTERESTING;
+ add_pending_object(&revs, &list[i]->object, "rev_list");
+ list[i]->util = (void *)1;
+ }
+ base->object.flags |= UNINTERESTING;
+ add_pending_object(&revs, &base->object, "base");
+
+ if (prepare_revision_walk(&revs))
+ die(_("revision walk setup failed"));
+ /*
+ * Traverse the commits list, get prerequisite patch ids
+ * and stuff them in bases structure.
+ */
+ while ((commit = get_revision(&revs)) != NULL) {
+ unsigned char sha1[20];
+ struct object_id *patch_id;
+ if (commit->util)
+ continue;
+ if (commit_patch_id(commit, &diffopt, sha1))
+ die(_("cannot get patch id"));
+ ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
+ patch_id = bases->patch_id + bases->nr_patch_id;
+ hashcpy(patch_id->hash, sha1);
+ bases->nr_patch_id++;
+ }
+}
+
+static void print_bases(struct base_tree_info *bases)
+{
+ int i;
+
+ /* Only do this once, either for the cover or for the first one */
+ if (is_null_oid(&bases->base_commit))
+ return;
+
+ /* Show the base commit */
+ printf("base-commit: %s\n", oid_to_hex(&bases->base_commit));
+
+ /* Show the prerequisite patches */
+ for (i = bases->nr_patch_id - 1; i >= 0; i--)
+ printf("prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i]));
+
+ free(bases->patch_id);
+ bases->nr_patch_id = 0;
+ bases->alloc_patch_id = 0;
+ oidclr(&bases->base_commit);
+}
+
int cmd_format_patch(int argc, const char **argv, const char *prefix)
{
struct commit *commit;
@@ -1209,6 +1369,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int reroll_count = -1;
char *branch_name = NULL;
char *from = NULL;
+ char *base_commit = NULL;
+ struct base_tree_info bases;
+
const struct option builtin_format_patch_options[] = {
{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
N_("use [PATCH n/m] even with a single patch"),
@@ -1271,6 +1434,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
PARSE_OPT_OPTARG, thread_callback },
OPT_STRING(0, "signature", &signature, N_("signature"),
N_("add a signature")),
+ OPT_STRING(0, "base", &base_commit, N_("base-commit"),
+ N_("add prerequisite tree info to the patch series")),
OPT_FILENAME(0, "signature-file", &signature_file,
N_("add a signature from a file")),
OPT__QUIET(&quiet, N_("don't print the patch filenames")),
@@ -1280,10 +1445,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
extra_hdr.strdup_strings = 1;
extra_to.strdup_strings = 1;
extra_cc.strdup_strings = 1;
- init_grep_defaults();
+ init_log_defaults();
git_config(git_format_config, NULL);
init_revisions(&rev, prefix);
rev.commit_format = CMIT_FMT_EMAIL;
+ rev.expand_tabs_in_log_default = 0;
rev.verbose_header = 1;
rev.diff = 1;
rev.max_parents = 1;
@@ -1507,6 +1673,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
signature = strbuf_detach(&buf, NULL);
}
+ memset(&bases, 0, sizeof(bases));
+ if (base_commit || base_auto) {
+ struct commit *base = get_base_commit(base_commit, list, nr);
+ reset_revision_walk();
+ prepare_bases(&bases, base, list, nr);
+ }
+
if (in_reply_to || thread || cover_letter)
rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
if (in_reply_to) {
@@ -1520,6 +1693,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
gen_message_id(&rev, "cover");
make_cover_letter(&rev, use_stdout,
origin, nr, list, branch_name, quiet);
+ print_bases(&bases);
total++;
start_number--;
}
@@ -1585,6 +1759,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
rev.mime_boundary);
else
print_signature();
+ print_bases(&bases);
}
if (!use_stdout)
fclose(stdout);
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 104277a..4859ede 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -109,7 +109,7 @@ static int populate_maildir_list(struct string_list *list, const char *path)
if ((dir = opendir(name)) == NULL) {
if (errno == ENOENT)
continue;
- error("cannot opendir %s (%s)", name, strerror(errno));
+ error_errno("cannot opendir %s", name);
goto out;
}
@@ -174,12 +174,12 @@ static int split_maildir(const char *maildir, const char *dir,
f = fopen(file, "r");
if (!f) {
- error("cannot open mail %s (%s)", file, strerror(errno));
+ error_errno("cannot open mail %s", file);
goto out;
}
if (strbuf_getwholeline(&buf, f, '\n')) {
- error("cannot read mail %s (%s)", file, strerror(errno));
+ error_errno("cannot read mail %s", file);
goto out;
}
@@ -210,7 +210,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
int file_done = 0;
if (!f) {
- error("cannot open mbox %s", file);
+ error_errno("cannot open mbox %s", file);
goto out;
}
@@ -318,7 +318,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
}
if (stat(arg, &argstat) == -1) {
- error("cannot stat %s (%s)", arg, strerror(errno));
+ error_errno("cannot stat %s", arg);
return 1;
}
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 5544705..13e22a2 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -62,8 +62,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
usage_with_options(merge_file_usage, options);
if (quiet) {
if (!freopen("/dev/null", "w", stderr))
- return error("failed to redirect stderr to /dev/null: "
- "%s", strerror(errno));
+ return error_errno("failed to redirect stderr to /dev/null");
}
if (prefix)
@@ -95,12 +94,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
if (!f)
- ret = error("Could not open %s for writing", filename);
+ ret = error_errno("Could not open %s for writing",
+ filename);
else if (result.size &&
fwrite(result.ptr, result.size, 1, f) != 1)
- ret = error("Could not write to %s", filename);
+ ret = error_errno("Could not write to %s", filename);
else if (fclose(f))
- ret = error("Could not close %s", filename);
+ ret = error_errno("Could not close %s", filename);
free(result.ptr);
}
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ca57004..5b7ab9b 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -150,15 +150,15 @@ static void show_result(void)
/* An empty entry never compares same, not even to another empty entry */
static int same_entry(struct name_entry *a, struct name_entry *b)
{
- return a->sha1 &&
- b->sha1 &&
- !hashcmp(a->sha1, b->sha1) &&
+ return a->oid &&
+ b->oid &&
+ !oidcmp(a->oid, b->oid) &&
a->mode == b->mode;
}
static int both_empty(struct name_entry *a, struct name_entry *b)
{
- return !(a->sha1 || b->sha1);
+ return !(a->oid || b->oid);
}
static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
@@ -188,8 +188,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s
return;
path = traverse_path(info, result);
- orig = create_entry(2, ours->mode, ours->sha1, path);
- final = create_entry(0, result->mode, result->sha1, path);
+ orig = create_entry(2, ours->mode, ours->oid->hash, path);
+ final = create_entry(0, result->mode, result->oid->hash, path);
final->link = orig;
@@ -213,7 +213,7 @@ static void unresolved_directory(const struct traverse_info *info,
newbase = traverse_path(info, p);
-#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->sha1 : NULL)
+#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid->hash : NULL)
buf0 = fill_tree_descriptor(t+0, ENTRY_SHA1(n + 0));
buf1 = fill_tree_descriptor(t+1, ENTRY_SHA1(n + 1));
buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
@@ -239,7 +239,7 @@ static struct merge_list *link_entry(unsigned stage, const struct traverse_info
path = entry->path;
else
path = traverse_path(info, n);
- link = create_entry(stage, n->mode, n->sha1, path);
+ link = create_entry(stage, n->mode, n->oid->hash, path);
link->link = entry;
return link;
}
@@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s
}
if (same_entry(entry+0, entry+1)) {
- if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) {
+ if (entry[2].oid && !S_ISDIR(entry[2].mode)) {
/* We did not touch, they modified -- take theirs */
resolve(info, entry+1, entry+2);
return mask;
diff --git a/builtin/merge.c b/builtin/merge.c
index 101ffef..b555a1b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -64,6 +64,7 @@ static int option_renormalize;
static int verbosity;
static int allow_rerere_auto;
static int abort_current_merge;
+static int allow_unrelated_histories;
static int show_progress = -1;
static int default_to_upstream = 1;
static const char *sign_commit;
@@ -221,6 +222,8 @@ static struct option builtin_merge_options[] = {
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "abort", &abort_current_merge,
N_("abort the current in-progress merge")),
+ OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
+ N_("allow merging unrelated histories")),
OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
@@ -819,6 +822,14 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads)
{
unsigned char result_tree[20], result_commit[20];
struct commit_list *parents, **pptr = &parents;
+ static struct lock_file lock;
+
+ hold_locked_index(&lock, 1);
+ refresh_cache(REFRESH_QUIET);
+ if (active_cache_changed &&
+ write_locked_index(&the_index, &lock, COMMIT_LOCK))
+ return error(_("Unable to write index."));
+ rollback_lock_file(&lock);
write_tree_trivial(result_tree);
printf(_("Wonderful.\n"));
@@ -1165,7 +1176,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
struct commit *head_commit;
struct strbuf buf = STRBUF_INIT;
const char *head_arg;
- int flag, i, ret = 0, head_subsumed;
+ int i, ret = 0, head_subsumed;
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
struct commit_list *common = NULL;
const char *best_strategy = NULL, *wt_strategy = NULL;
@@ -1179,7 +1190,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* Check if we are _not_ on a detached HEAD, i.e. if there is a
* current branch.
*/
- branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, &flag);
+ branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, NULL);
if (branch && starts_with(branch, "refs/heads/"))
branch += 11;
if (!branch || is_null_sha1(head_sha1))
@@ -1187,6 +1198,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
else
head_commit = lookup_commit_or_die(head_sha1, "HEAD");
+ init_diff_ui_defaults();
git_config(git_merge_config, NULL);
if (branch_mergeoptions)
@@ -1257,12 +1269,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
builtin_merge_options);
if (!head_commit) {
- struct commit *remote_head;
/*
* If the merged head is a valid one there is no reason
* to forbid "git merge" into a branch yet to be born.
* We do the same for "git pull".
*/
+ unsigned char *remote_head_sha1;
if (squash)
die(_("Squash commit into empty head not supported yet"));
if (fast_forward == FF_NO)
@@ -1270,13 +1282,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
"an empty head"));
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, NULL);
- remote_head = remoteheads->item;
- if (!remote_head)
+ if (!remoteheads)
die(_("%s - not something we can merge"), argv[0]);
if (remoteheads->next)
die(_("Can merge only exactly one commit into empty head"));
- read_empty(remote_head->object.oid.hash, 0);
- update_ref("initial pull", "HEAD", remote_head->object.oid.hash,
+ remote_head_sha1 = remoteheads->item->object.oid.hash;
+ read_empty(remote_head_sha1, 0);
+ update_ref("initial pull", "HEAD", remote_head_sha1,
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
goto done;
}
@@ -1397,9 +1409,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash,
NULL, 0, UPDATE_REFS_DIE_ON_ERR);
- if (remoteheads && !common)
- ; /* No common ancestors found. We need a real merge. */
- else if (!remoteheads ||
+ if (remoteheads && !common) {
+ /* No common ancestors found. */
+ if (!allow_unrelated_histories)
+ die(_("refusing to merge unrelated histories"));
+ /* otherwise, we need a real merge. */
+ } else if (!remoteheads ||
(!remoteheads->next && !common->next &&
common->item == remoteheads->item)) {
/*
diff --git a/builtin/mv.c b/builtin/mv.c
index aeae855..a201426 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -252,15 +252,18 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int pos;
if (show_only || verbose)
printf(_("Renaming %s to %s\n"), src, dst);
- if (!show_only && mode != INDEX) {
- if (rename(src, dst) < 0 && !ignore_errors)
- die_errno(_("renaming '%s' failed"), src);
- if (submodule_gitfile[i]) {
- if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
- connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
- if (!update_path_in_gitmodules(src, dst))
- gitmodules_modified = 1;
- }
+ if (show_only)
+ continue;
+ if (mode != INDEX && rename(src, dst) < 0) {
+ if (ignore_errors)
+ continue;
+ die_errno(_("renaming '%s' failed"), src);
+ }
+ if (submodule_gitfile[i]) {
+ if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
+ connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
+ if (!update_path_in_gitmodules(src, dst))
+ gitmodules_modified = 1;
}
if (mode == WORKING_DIRECTORY)
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 092e03c..57be35f 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -10,6 +10,7 @@
typedef struct rev_name {
const char *tip_name;
+ unsigned long taggerdate;
int generation;
int distance;
} rev_name;
@@ -20,7 +21,8 @@ static long cutoff = LONG_MAX;
#define MERGE_TRAVERSAL_WEIGHT 65535
static void name_rev(struct commit *commit,
- const char *tip_name, int generation, int distance,
+ const char *tip_name, unsigned long taggerdate,
+ int generation, int distance,
int deref)
{
struct rev_name *name = (struct rev_name *)commit->util;
@@ -43,9 +45,12 @@ static void name_rev(struct commit *commit,
name = xmalloc(sizeof(rev_name));
commit->util = name;
goto copy_data;
- } else if (name->distance > distance) {
+ } else if (name->taggerdate > taggerdate ||
+ (name->taggerdate == taggerdate &&
+ name->distance > distance)) {
copy_data:
name->tip_name = tip_name;
+ name->taggerdate = taggerdate;
name->generation = generation;
name->distance = distance;
} else
@@ -66,11 +71,11 @@ copy_data:
new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
parent_number);
- name_rev(parents->item, new_name, 0,
+ name_rev(parents->item, new_name, taggerdate, 0,
distance + MERGE_TRAVERSAL_WEIGHT, 0);
} else {
- name_rev(parents->item, tip_name, generation + 1,
- distance + 1, 0);
+ name_rev(parents->item, tip_name, taggerdate,
+ generation + 1, distance + 1, 0);
}
}
}
@@ -140,6 +145,7 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
struct name_ref_data *data = cb_data;
int can_abbreviate_output = data->tags_only && data->name_only;
int deref = 0;
+ unsigned long taggerdate = ULONG_MAX;
if (data->tags_only && !starts_with(path, "refs/tags/"))
return 0;
@@ -164,12 +170,13 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
break; /* broken repository */
o = parse_object(t->tagged->oid.hash);
deref = 1;
+ taggerdate = t->date;
}
if (o && o->type == OBJ_COMMIT) {
struct commit *commit = (struct commit *)o;
path = name_ref_abbrev(path, can_abbreviate_output);
- name_rev(commit, xstrdup(path), 0, 0, deref);
+ name_rev(commit, xstrdup(path), taggerdate, 0, 0, deref);
}
return 0;
}
diff --git a/builtin/notes.c b/builtin/notes.c
index ed6f222..c65b59a 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -744,13 +744,14 @@ static int merge_commit(struct notes_merge_options *o)
static int git_config_get_notes_strategy(const char *key,
enum notes_merge_strategy *strategy)
{
- const char *value;
+ char *value;
- if (git_config_get_string_const(key, &value))
+ if (git_config_get_string(key, &value))
return 1;
if (parse_notes_merge_strategy(value, strategy))
git_die_config(key, "unknown notes merge strategy %s", value);
+ free(value);
return 0;
}
@@ -846,15 +847,15 @@ static int merge(int argc, const char **argv, const char *prefix)
update_ref(msg.buf, default_notes_ref(), result_sha1, NULL,
0, UPDATE_REFS_DIE_ON_ERR);
else { /* Merge has unresolved conflicts */
- char *existing;
+ const struct worktree *wt;
/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_sha1, NULL,
0, UPDATE_REFS_DIE_ON_ERR);
/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
- existing = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
- if (existing)
+ wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
+ if (wt)
die(_("A notes merge into %s is already in-progress at %s"),
- default_notes_ref(), existing);
+ default_notes_ref(), wt->path);
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die("Failed to store link to current notes ref (%s)",
default_notes_ref());
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a27de5b..8f5e358 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -759,6 +759,10 @@ static off_t write_reused_pack(struct sha1file *f)
return reuse_packfile_offset - sizeof(struct pack_header);
}
+static const char no_split_warning[] = N_(
+"disabling bitmap writing, packs are split due to pack.packSizeLimit"
+);
+
static void write_pack_file(void)
{
uint32_t i = 0, j;
@@ -813,7 +817,10 @@ static void write_pack_file(void)
fixup_pack_header_footer(fd, sha1, pack_tmp_name,
nr_written, sha1, offset);
close(fd);
- write_bitmap_index = 0;
+ if (write_bitmap_index) {
+ warning(_(no_split_warning));
+ write_bitmap_index = 0;
+ }
}
if (!pack_to_stdout) {
@@ -828,8 +835,7 @@ static void write_pack_file(void)
* to preserve this property.
*/
if (stat(pack_tmp_name, &st) < 0) {
- warning("failed to stat %s: %s",
- pack_tmp_name, strerror(errno));
+ warning_errno("failed to stat %s", pack_tmp_name);
} else if (!last_mtime) {
last_mtime = st.st_mtime;
} else {
@@ -837,8 +843,7 @@ static void write_pack_file(void)
utb.actime = st.st_atime;
utb.modtime = --last_mtime;
if (utime(pack_tmp_name, &utb) < 0)
- warning("failed utime() on %s: %s",
- pack_tmp_name, strerror(errno));
+ warning_errno("failed utime() on %s", pack_tmp_name);
}
strbuf_addf(&tmpname, "%s-", base_name);
@@ -1186,7 +1191,7 @@ static void add_pbase_object(struct tree_desc *tree,
if (cmp < 0)
return;
if (name[cmplen] != '/') {
- add_object_entry(entry.sha1,
+ add_object_entry(entry.oid->hash,
object_type(entry.mode),
fullname, 1);
return;
@@ -1197,7 +1202,7 @@ static void add_pbase_object(struct tree_desc *tree,
const char *down = name+cmplen+1;
int downlen = name_cmp_len(down);
- tree = pbase_tree_get(entry.sha1);
+ tree = pbase_tree_get(entry.oid->hash);
if (!tree)
return;
init_tree_desc(&sub, tree->tree_data, tree->tree_size);
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 366ce5a..a84d000 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -81,16 +81,13 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
char *line = line_buf->buf;
- char *p = line;
+ const char *p = line;
int len;
- if (!memcmp(line, "diff-tree ", 10))
- p += 10;
- else if (!memcmp(line, "commit ", 7))
- p += 7;
- else if (!memcmp(line, "From ", 5))
- p += 5;
- else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line))
+ if (!skip_prefix(line, "diff-tree ", &p) &&
+ !skip_prefix(line, "commit ", &p) &&
+ !skip_prefix(line, "From ", &p) &&
+ starts_with(line, "\\ ") && 12 < strlen(line))
continue;
if (!get_oid_hex(p, next_oid)) {
@@ -99,14 +96,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
}
/* Ignore commit comments */
- if (!patchlen && memcmp(line, "diff ", 5))
+ if (!patchlen && !starts_with(line, "diff "))
continue;
/* Parsing diff header? */
if (before == -1) {
- if (!memcmp(line, "index ", 6))
+ if (starts_with(line, "index "))
continue;
- else if (!memcmp(line, "--- ", 4))
+ else if (starts_with(line, "--- "))
before = after = 1;
else if (!isalpha(line[0]))
break;
@@ -114,14 +111,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
/* Looking for a valid hunk header? */
if (before == 0 && after == 0) {
- if (!memcmp(line, "@@ -", 4)) {
+ if (starts_with(line, "@@ -")) {
/* Parse next hunk, but ignore line numbers. */
scan_hunk_header(line, &before, &after);
continue;
}
/* Split at the end of the patch. */
- if (memcmp(line, "diff ", 5))
+ if (!starts_with(line, "diff "))
break;
/* Else we're parsing another header. */
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..1d7333c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -86,9 +86,12 @@ static char *opt_commit;
static char *opt_edit;
static char *opt_ff;
static char *opt_verify_signatures;
+static int opt_autostash = -1;
+static int config_autostash;
static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
static char *opt_gpg_sign;
+static int opt_allow_unrelated_histories;
/* Options passed to git-fetch */
static char *opt_all;
@@ -149,6 +152,8 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
N_("verify that the named commit has a valid GPG signature"),
PARSE_OPT_NOARG),
+ OPT_BOOL(0, "autostash", &opt_autostash,
+ N_("automatically stash/stash pop before and after rebase")),
OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
N_("merge strategy to use"),
0),
@@ -159,6 +164,9 @@ static struct option pull_options[] = {
OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"),
N_("GPG sign commit"),
PARSE_OPT_OPTARG),
+ OPT_SET_INT(0, "allow-unrelated-histories",
+ &opt_allow_unrelated_histories,
+ N_("allow merging unrelated histories"), 1),
/* Options passed to git-fetch */
OPT_GROUP(N_("Options related to fetching")),
@@ -306,6 +314,18 @@ static enum rebase_type config_get_rebase(void)
}
/**
+ * Read config variables.
+ */
+static int git_pull_config(const char *var, const char *value, void *cb)
+{
+ if (!strcmp(var, "rebase.autostash")) {
+ config_autostash = git_config_bool(var, value);
+ return 0;
+ }
+ return git_default_config(var, value, cb);
+}
+
+/**
* Returns 1 if there are unstaged changes, 0 otherwise.
*/
static int has_unstaged_changes(const char *prefix)
@@ -458,13 +478,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
fprintf_ln(stderr, _("See git-pull(1) for details."));
fprintf(stderr, "\n");
- fprintf_ln(stderr, " git pull <remote> <branch>");
+ fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
fprintf(stderr, "\n");
} else if (!curr_branch->merge_nr) {
const char *remote_name = NULL;
if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
- remote_name = "<remote>";
+ remote_name = _("<remote>");
fprintf_ln(stderr, _("There is no tracking information for the current branch."));
if (opt_rebase)
@@ -473,12 +493,12 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
fprintf_ln(stderr, _("See git-pull(1) for details."));
fprintf(stderr, "\n");
- fprintf_ln(stderr, " git pull <remote> <branch>");
+ fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
fprintf(stderr, "\n");
- fprintf_ln(stderr, _("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"),
- remote_name, curr_branch->name);
+ fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:"));
+ fprintf(stderr, "\n");
+ fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n",
+ remote_name, _("<branch>"), curr_branch->name);
} else
fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."),
@@ -612,6 +632,8 @@ static int run_merge(void)
argv_array_pushv(&args, opt_strategy_opts.argv);
if (opt_gpg_sign)
argv_array_push(&args, opt_gpg_sign);
+ if (opt_allow_unrelated_histories > 0)
+ argv_array_push(&args, "--allow-unrelated-histories");
argv_array_push(&args, "FETCH_HEAD");
ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
@@ -789,6 +811,10 @@ static int run_rebase(const unsigned char *curr_head,
argv_array_pushv(&args, opt_strategy_opts.argv);
if (opt_gpg_sign)
argv_array_push(&args, opt_gpg_sign);
+ if (opt_autostash == 0)
+ argv_array_push(&args, "--no-autostash");
+ else if (opt_autostash == 1)
+ argv_array_push(&args, "--autostash");
argv_array_push(&args, "--onto");
argv_array_push(&args, sha1_to_hex(merge_head));
@@ -823,7 +849,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (opt_rebase < 0)
opt_rebase = config_get_rebase();
- git_config(git_default_config, NULL);
+ git_config(git_pull_config, NULL);
if (read_cache_unmerged())
die_resolve_conflict("Pull");
@@ -834,13 +860,17 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (get_sha1("HEAD", orig_head))
hashclr(orig_head);
+ if (!opt_rebase && opt_autostash != -1)
+ die(_("--[no-]autostash option is only valid with --rebase."));
+
if (opt_rebase) {
- int autostash = 0;
+ int autostash = config_autostash;
+ if (opt_autostash != -1)
+ autostash = opt_autostash;
if (is_null_sha1(orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index."));
- git_config_get_bool("rebase.autostash", &autostash);
if (!autostash)
die_on_unclean_work_tree(prefix);
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c8e32b2..a744437 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -21,7 +21,10 @@
#include "sigchain.h"
#include "fsck.h"
-static const char receive_pack_usage[] = "git receive-pack <git-dir>";
+static const char * const receive_pack_usage[] = {
+ N_("git receive-pack <git-dir>"),
+ NULL
+};
enum deny_action {
DENY_UNCONFIGURED,
@@ -49,7 +52,7 @@ static int quiet;
static int prefer_ofs_delta = 1;
static int auto_update_server_info;
static int auto_gc = 1;
-static int fix_thin = 1;
+static int reject_thin;
static int stateless_rpc;
static const char *service_dir;
static const char *head_name;
@@ -1081,13 +1084,13 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)
if (!(flag & REF_ISSYMREF))
return;
- dst_name = strip_namespace(dst_name);
if (!dst_name) {
rp_error("refusing update to broken symref '%s'", cmd->ref_name);
cmd->skip_update = 1;
cmd->error_string = "broken symref";
return;
}
+ dst_name = strip_namespace(dst_name);
if ((item = string_list_lookup(list, dst_name)) == NULL)
return;
@@ -1548,7 +1551,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
if (fsck_objects)
argv_array_pushf(&child.args, "--strict%s",
fsck_msg_types.buf);
- if (fix_thin)
+ if (!reject_thin)
argv_array_push(&child.args, "--fix-thin");
child.out = -1;
child.err = err_fd;
@@ -1707,45 +1710,29 @@ static int delete_only(struct command *commands)
int cmd_receive_pack(int argc, const char **argv, const char *prefix)
{
int advertise_refs = 0;
- int i;
struct command *commands;
struct sha1_array shallow = SHA1_ARRAY_INIT;
struct sha1_array ref = SHA1_ARRAY_INIT;
struct shallow_info si;
- packet_trace_identity("receive-pack");
+ struct option options[] = {
+ OPT__QUIET(&quiet, N_("quiet")),
+ OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL),
+ OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL),
+ OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL),
+ OPT_END()
+ };
- argv++;
- for (i = 1; i < argc; i++) {
- const char *arg = *argv++;
+ packet_trace_identity("receive-pack");
- if (*arg == '-') {
- if (!strcmp(arg, "--quiet")) {
- quiet = 1;
- continue;
- }
+ argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0);
- if (!strcmp(arg, "--advertise-refs")) {
- advertise_refs = 1;
- continue;
- }
- if (!strcmp(arg, "--stateless-rpc")) {
- stateless_rpc = 1;
- continue;
- }
- if (!strcmp(arg, "--reject-thin-pack-for-testing")) {
- fix_thin = 0;
- continue;
- }
+ if (argc > 1)
+ usage_msg_opt(_("Too many arguments."), receive_pack_usage, options);
+ if (argc == 0)
+ usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options);
- usage(receive_pack_usage);
- }
- if (service_dir)
- usage(receive_pack_usage);
- service_dir = arg;
- }
- if (!service_dir)
- usage(receive_pack_usage);
+ service_dir = argv[0];
setup_path();
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2d46b64..7a7136e 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -84,8 +84,8 @@ static int tree_is_complete(const unsigned char *sha1)
init_tree_desc(&desc, tree->buffer, tree->size);
complete = 1;
while (tree_entry(&desc, &entry)) {
- if (!has_sha1_file(entry.sha1) ||
- (S_ISDIR(entry.mode) && !tree_is_complete(entry.sha1))) {
+ if (!has_sha1_file(entry.oid->hash) ||
+ (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid->hash))) {
tree->object.flags |= INCOMPLETE;
complete = 0;
}
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index 7457c74..88eb8f9 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -168,7 +168,7 @@ static int command_loop(const char *child)
size_t i;
if (!fgets(buffer, MAXCOMMAND - 1, stdin)) {
if (ferror(stdin))
- die("Comammand input error");
+ die("Command input error");
exit(0);
}
/* Strip end of line characters. */
diff --git a/builtin/remote.c b/builtin/remote.c
index fda5c2e..d33766b 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1154,6 +1154,8 @@ static int show(int argc, const char **argv)
url_nr = states.remote->url_nr;
}
for (i = 0; i < url_nr; i++)
+ /* TRANSLATORS: the colon ':' should align with
+ the one in " Fetch URL: %s" translation */
printf_ln(_(" Push URL: %s"), url[i]);
if (!i)
printf_ln(_(" Push URL: %s"), "(no URL)");
diff --git a/builtin/replace.c b/builtin/replace.c
index 748c6ca..b58c714 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -440,6 +440,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
};
check_replace_refs = 0;
+ git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index cf8487b..c961b74 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -505,6 +505,7 @@ N_("git rev-parse --parseopt [<options>] -- [<args>...]\n"
int cmd_rev_parse(int argc, const char **argv, const char *prefix)
{
int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
+ int did_repo_setup = 0;
int has_dashdash = 0;
int output_prefix = 0;
unsigned char sha1[20];
@@ -528,11 +529,40 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
}
}
- prefix = setup_git_directory();
- git_config(git_default_config, NULL);
+ /* No options; just report on whether we're in a git repo or not. */
+ if (argc == 1) {
+ setup_git_directory();
+ git_config(git_default_config, NULL);
+ return 0;
+ }
+
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
+ if (!strcmp(arg, "--local-env-vars")) {
+ int i;
+ for (i = 0; local_repo_env[i]; i++)
+ printf("%s\n", local_repo_env[i]);
+ continue;
+ }
+ if (!strcmp(arg, "--resolve-git-dir")) {
+ const char *gitdir = argv[++i];
+ if (!gitdir)
+ die("--resolve-git-dir requires an argument");
+ gitdir = resolve_gitdir(gitdir);
+ if (!gitdir)
+ die("not a gitdir '%s'", argv[i]);
+ puts(gitdir);
+ continue;
+ }
+
+ /* The rest of the options require a git repository. */
+ if (!did_repo_setup) {
+ prefix = setup_git_directory();
+ git_config(git_default_config, NULL);
+ did_repo_setup = 1;
+ }
+
if (!strcmp(arg, "--git-path")) {
if (!argv[i + 1])
die("--git-path requires an argument");
@@ -706,12 +736,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
add_ref_exclusion(&ref_excludes, arg + 10);
continue;
}
- if (!strcmp(arg, "--local-env-vars")) {
- int i;
- for (i = 0; local_repo_env[i]; i++)
- printf("%s\n", local_repo_env[i]);
- continue;
- }
if (!strcmp(arg, "--show-toplevel")) {
const char *work_tree = get_git_work_tree();
if (work_tree)
@@ -767,16 +791,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
puts(prefix_filename(pfx, strlen(pfx), get_git_common_dir()));
continue;
}
- if (!strcmp(arg, "--resolve-git-dir")) {
- const char *gitdir = argv[++i];
- if (!gitdir)
- die("--resolve-git-dir requires an argument");
- gitdir = resolve_gitdir(gitdir);
- if (!gitdir)
- die("not a gitdir '%s'", argv[i]);
- puts(gitdir);
- continue;
- }
if (!strcmp(arg, "--is-inside-git-dir")) {
printf("%s\n", is_inside_git_dir() ? "true"
: "false");
diff --git a/builtin/rm.c b/builtin/rm.c
index 8829b09..8abb020 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -152,7 +152,7 @@ static int check_local_mod(unsigned char *head, int index_only)
if (lstat(ce->name, &st) < 0) {
if (errno != ENOENT && errno != ENOTDIR)
- warning("'%s': %s", ce->name, strerror(errno));
+ warning_errno(_("failed to stat '%s'"), ce->name);
/* It already vanished from the working tree */
continue;
}
@@ -314,7 +314,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
if (list.entry[list.nr++].is_submodule &&
!is_staging_gitmodules_ok())
- die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
+ die (_("Please stage your changes to .gitmodules or stash them to proceed"));
}
if (pathspec.nr) {
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 5b9dd6a..1ff5a67 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -225,7 +225,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
* --all and --mirror are incompatible; neither makes sense
* with any refspecs.
*/
- if ((refspecs && (send_all || args.send_mirror)) ||
+ if ((nr_refspecs > 0 && (send_all || args.send_mirror)) ||
(send_all && args.send_mirror))
usage_with_options(send_pack_usage, options);
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5295b72..926d205 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -9,6 +9,211 @@
#include "submodule-config.h"
#include "string-list.h"
#include "run-command.h"
+#include "remote.h"
+#include "refs.h"
+#include "connect.h"
+
+static char *get_default_remote(void)
+{
+ char *dest = NULL, *ret;
+ unsigned char sha1[20];
+ struct strbuf sb = STRBUF_INIT;
+ const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+
+ if (!refname)
+ die(_("No such ref: %s"), "HEAD");
+
+ /* detached HEAD */
+ if (!strcmp(refname, "HEAD"))
+ return xstrdup("origin");
+
+ if (!skip_prefix(refname, "refs/heads/", &refname))
+ die(_("Expecting a full ref name, got %s"), refname);
+
+ strbuf_addf(&sb, "branch.%s.remote", refname);
+ if (git_config_get_string(sb.buf, &dest))
+ ret = xstrdup("origin");
+ else
+ ret = dest;
+
+ strbuf_release(&sb);
+ return ret;
+}
+
+static int starts_with_dot_slash(const char *str)
+{
+ return str[0] == '.' && is_dir_sep(str[1]);
+}
+
+static int starts_with_dot_dot_slash(const char *str)
+{
+ return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
+}
+
+/*
+ * Returns 1 if it was the last chop before ':'.
+ */
+static int chop_last_dir(char **remoteurl, int is_relative)
+{
+ char *rfind = find_last_dir_sep(*remoteurl);
+ if (rfind) {
+ *rfind = '\0';
+ return 0;
+ }
+
+ rfind = strrchr(*remoteurl, ':');
+ if (rfind) {
+ *rfind = '\0';
+ return 1;
+ }
+
+ if (is_relative || !strcmp(".", *remoteurl))
+ die(_("cannot strip one component off url '%s'"),
+ *remoteurl);
+
+ free(*remoteurl);
+ *remoteurl = xstrdup(".");
+ return 0;
+}
+
+/*
+ * The `url` argument is the URL that navigates to the submodule origin
+ * repo. When relative, this URL is relative to the superproject origin
+ * URL repo. The `up_path` argument, if specified, is the relative
+ * path that navigates from the submodule working tree to the superproject
+ * working tree. Returns the origin URL of the submodule.
+ *
+ * Return either an absolute URL or filesystem path (if the superproject
+ * origin URL is an absolute URL or filesystem path, respectively) or a
+ * relative file system path (if the superproject origin URL is a relative
+ * file system path).
+ *
+ * When the output is a relative file system path, the path is either
+ * relative to the submodule working tree, if up_path is specified, or to
+ * the superproject working tree otherwise.
+ *
+ * NEEDSWORK: This works incorrectly on the domain and protocol part.
+ * remote_url url outcome expectation
+ * http://a.com/b ../c http://a.com/c as is
+ * http://a.com/b ../../c http://c error out
+ * http://a.com/b ../../../c http:/c error out
+ * http://a.com/b ../../../../c http:c error out
+ * http://a.com/b ../../../../../c .:c error out
+ * NEEDSWORK: Given how chop_last_dir() works, this function is broken
+ * when a local part has a colon in its path component, too.
+ */
+static char *relative_url(const char *remote_url,
+ const char *url,
+ const char *up_path)
+{
+ int is_relative = 0;
+ int colonsep = 0;
+ char *out;
+ char *remoteurl = xstrdup(remote_url);
+ struct strbuf sb = STRBUF_INIT;
+ size_t len = strlen(remoteurl);
+
+ if (is_dir_sep(remoteurl[len]))
+ remoteurl[len] = '\0';
+
+ if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl))
+ is_relative = 0;
+ else {
+ is_relative = 1;
+ /*
+ * Prepend a './' to ensure all relative
+ * remoteurls start with './' or '../'
+ */
+ if (!starts_with_dot_slash(remoteurl) &&
+ !starts_with_dot_dot_slash(remoteurl)) {
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "./%s", remoteurl);
+ free(remoteurl);
+ remoteurl = strbuf_detach(&sb, NULL);
+ }
+ }
+ /*
+ * When the url starts with '../', remove that and the
+ * last directory in remoteurl.
+ */
+ while (url) {
+ if (starts_with_dot_dot_slash(url)) {
+ url += 3;
+ colonsep |= chop_last_dir(&remoteurl, is_relative);
+ } else if (starts_with_dot_slash(url))
+ url += 2;
+ else
+ break;
+ }
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url);
+ free(remoteurl);
+
+ if (starts_with_dot_slash(sb.buf))
+ out = xstrdup(sb.buf + 2);
+ else
+ out = xstrdup(sb.buf);
+ strbuf_reset(&sb);
+
+ if (!up_path || !is_relative)
+ return out;
+
+ strbuf_addf(&sb, "%s%s", up_path, out);
+ free(out);
+ return strbuf_detach(&sb, NULL);
+}
+
+static int resolve_relative_url(int argc, const char **argv, const char *prefix)
+{
+ char *remoteurl = NULL;
+ char *remote = get_default_remote();
+ const char *up_path = NULL;
+ char *res;
+ const char *url;
+ struct strbuf sb = STRBUF_INIT;
+
+ if (argc != 2 && argc != 3)
+ die("resolve-relative-url only accepts one or two arguments");
+
+ url = argv[1];
+ strbuf_addf(&sb, "remote.%s.url", remote);
+ free(remote);
+
+ if (git_config_get_string(sb.buf, &remoteurl))
+ /* the repository is its own authoritative upstream */
+ remoteurl = xgetcwd();
+
+ if (argc == 3)
+ up_path = argv[2];
+
+ res = relative_url(remoteurl, url, up_path);
+ puts(res);
+ free(res);
+ free(remoteurl);
+ return 0;
+}
+
+static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
+{
+ char *remoteurl, *res;
+ const char *up_path, *url;
+
+ if (argc != 4)
+ die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>");
+
+ up_path = argv[1];
+ remoteurl = xstrdup(argv[2]);
+ url = argv[3];
+
+ if (!strcmp(up_path, "(null)"))
+ up_path = NULL;
+
+ res = relative_url(remoteurl, url, up_path);
+ puts(res);
+ free(res);
+ free(remoteurl);
+ return 0;
+}
struct module_list {
const struct cache_entry **entries;
@@ -82,10 +287,8 @@ static int module_list(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, module_list_options,
git_submodule_helper_usage, 0);
- if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) {
- printf("#unmatched\n");
+ if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
return 1;
- }
for (i = 0; i < list.nr; i++) {
const struct cache_entry *ce = list.entries[i];
@@ -100,6 +303,125 @@ static int module_list(int argc, const char **argv, const char *prefix)
return 0;
}
+static void init_submodule(const char *path, const char *prefix, int quiet)
+{
+ const struct submodule *sub;
+ struct strbuf sb = STRBUF_INIT;
+ char *upd = NULL, *url = NULL, *displaypath;
+
+ /* Only loads from .gitmodules, no overlay with .git/config */
+ gitmodules_config();
+
+ if (prefix) {
+ strbuf_addf(&sb, "%s%s", prefix, path);
+ displaypath = strbuf_detach(&sb, NULL);
+ } else
+ displaypath = xstrdup(path);
+
+ sub = submodule_from_path(null_sha1, path);
+
+ if (!sub)
+ die(_("No url found for submodule path '%s' in .gitmodules"),
+ displaypath);
+
+ /*
+ * Copy url setting when it is not set yet.
+ * To look up the url in .git/config, we must not fall back to
+ * .gitmodules, so look it up directly.
+ */
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "submodule.%s.url", sub->name);
+ if (git_config_get_string(sb.buf, &url)) {
+ url = xstrdup(sub->url);
+
+ if (!url)
+ die(_("No url found for submodule path '%s' in .gitmodules"),
+ displaypath);
+
+ /* Possibly a url relative to parent */
+ if (starts_with_dot_dot_slash(url) ||
+ starts_with_dot_slash(url)) {
+ char *remoteurl, *relurl;
+ char *remote = get_default_remote();
+ struct strbuf remotesb = STRBUF_INIT;
+ strbuf_addf(&remotesb, "remote.%s.url", remote);
+ free(remote);
+
+ if (git_config_get_string(remotesb.buf, &remoteurl))
+ /*
+ * The repository is its own
+ * authoritative upstream
+ */
+ remoteurl = xgetcwd();
+ relurl = relative_url(remoteurl, url, NULL);
+ strbuf_release(&remotesb);
+ free(remoteurl);
+ free(url);
+ url = relurl;
+ }
+
+ if (git_config_set_gently(sb.buf, url))
+ die(_("Failed to register url for submodule path '%s'"),
+ displaypath);
+ if (!quiet)
+ fprintf(stderr,
+ _("Submodule '%s' (%s) registered for path '%s'\n"),
+ sub->name, url, displaypath);
+ }
+
+ /* Copy "update" setting when it is not set yet */
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "submodule.%s.update", sub->name);
+ if (git_config_get_string(sb.buf, &upd) &&
+ sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
+ if (sub->update_strategy.type == SM_UPDATE_COMMAND) {
+ fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"),
+ sub->name);
+ upd = xstrdup("none");
+ } else
+ upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy));
+
+ if (git_config_set_gently(sb.buf, upd))
+ die(_("Failed to register update mode for submodule path '%s'"), displaypath);
+ }
+ strbuf_release(&sb);
+ free(displaypath);
+ free(url);
+ free(upd);
+}
+
+static int module_init(int argc, const char **argv, const char *prefix)
+{
+ struct pathspec pathspec;
+ struct module_list list = MODULE_LIST_INIT;
+ int quiet = 0;
+ int i;
+
+ struct option module_init_options[] = {
+ OPT_STRING(0, "prefix", &prefix,
+ N_("path"),
+ N_("alternative anchor for relative paths")),
+ OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
+ OPT_END()
+ };
+
+ const char *const git_submodule_helper_usage[] = {
+ N_("git submodule--helper init [<path>]"),
+ NULL
+ };
+
+ argc = parse_options(argc, argv, prefix, module_init_options,
+ git_submodule_helper_usage, 0);
+
+ if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
+ return 1;
+
+ for (i = 0; i < list.nr; i++)
+ init_submodule(list.entries[i]->name, prefix, quiet);
+
+ return 0;
+}
+
static int module_name(int argc, const char **argv, const char *prefix)
{
const struct submodule *sub;
@@ -118,6 +440,7 @@ static int module_name(int argc, const char **argv, const char *prefix)
return 0;
}
+
static int clone_submodule(const char *path, const char *gitdir, const char *url,
const char *depth, const char *reference, int quiet)
{
@@ -139,7 +462,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
argv_array_push(&cp.args, path);
cp.git_cmd = 1;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.no_stdin = 1;
return run_command(&cp);
@@ -147,11 +470,11 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
static int module_clone(int argc, const char **argv, const char *prefix)
{
- const char *path = NULL, *name = NULL, *url = NULL;
+ const char *name = NULL, *url = NULL;
const char *reference = NULL, *depth = NULL;
int quiet = 0;
FILE *submodule_dot_git;
- char *sm_gitdir, *cwd, *p;
+ char *p, *path = NULL, *sm_gitdir;
struct strbuf rel_path = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
@@ -180,16 +503,27 @@ static int module_clone(int argc, const char **argv, const char *prefix)
const char *const git_submodule_helper_usage[] = {
N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
- "[--reference <repository>] [--name <name>] [--url <url>]"
- "[--depth <depth>] [--] [<path>...]"),
+ "[--reference <repository>] [--name <name>] [--depth <depth>] "
+ "--url <url> --path <path>"),
NULL
};
argc = parse_options(argc, argv, prefix, module_clone_options,
git_submodule_helper_usage, 0);
+ if (argc || !url || !path || !*path)
+ usage_with_options(git_submodule_helper_usage,
+ module_clone_options);
+
strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
- sm_gitdir = strbuf_detach(&sb, NULL);
+ sm_gitdir = xstrdup(absolute_path(sb.buf));
+ strbuf_reset(&sb);
+
+ if (!is_absolute_path(path)) {
+ strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
+ path = strbuf_detach(&sb, NULL);
+ } else
+ path = xstrdup(path);
if (!file_exists(sm_gitdir)) {
if (safe_create_leading_directories_const(sm_gitdir) < 0)
@@ -206,49 +540,308 @@ static int module_clone(int argc, const char **argv, const char *prefix)
}
/* Write a .git file in the submodule to redirect to the superproject. */
- if (safe_create_leading_directories_const(path) < 0)
- die(_("could not create directory '%s'"), path);
-
- if (path && *path)
- strbuf_addf(&sb, "%s/.git", path);
- else
- strbuf_addstr(&sb, ".git");
-
+ strbuf_addf(&sb, "%s/.git", path);
if (safe_create_leading_directories_const(sb.buf) < 0)
die(_("could not create leading directories of '%s'"), sb.buf);
submodule_dot_git = fopen(sb.buf, "w");
if (!submodule_dot_git)
die_errno(_("cannot open file '%s'"), sb.buf);
- fprintf(submodule_dot_git, "gitdir: %s\n",
- relative_path(sm_gitdir, path, &rel_path));
+ fprintf_or_die(submodule_dot_git, "gitdir: %s\n",
+ relative_path(sm_gitdir, path, &rel_path));
if (fclose(submodule_dot_git))
die(_("could not close file %s"), sb.buf);
strbuf_reset(&sb);
strbuf_reset(&rel_path);
- cwd = xgetcwd();
/* Redirect the worktree of the submodule in the superproject's config */
- if (!is_absolute_path(sm_gitdir)) {
- strbuf_addf(&sb, "%s/%s", cwd, sm_gitdir);
- free(sm_gitdir);
- sm_gitdir = strbuf_detach(&sb, NULL);
- }
-
- strbuf_addf(&sb, "%s/%s", cwd, path);
p = git_pathdup_submodule(path, "config");
if (!p)
die(_("could not get submodule directory for '%s'"), path);
git_config_set_in_file(p, "core.worktree",
- relative_path(sb.buf, sm_gitdir, &rel_path));
+ relative_path(path, sm_gitdir, &rel_path));
strbuf_release(&sb);
strbuf_release(&rel_path);
free(sm_gitdir);
- free(cwd);
+ free(path);
free(p);
return 0;
}
+struct submodule_update_clone {
+ /* index into 'list', the list of submodules to look into for cloning */
+ int current;
+ struct module_list list;
+ unsigned warn_if_uninitialized : 1;
+
+ /* update parameter passed via commandline */
+ struct submodule_update_strategy update;
+
+ /* configuration parameters which are passed on to the children */
+ int quiet;
+ const char *reference;
+ const char *depth;
+ const char *recursive_prefix;
+ const char *prefix;
+
+ /* Machine-readable status lines to be consumed by git-submodule.sh */
+ struct string_list projectlines;
+
+ /* If we want to stop as fast as possible and return an error */
+ unsigned quickstop : 1;
+};
+#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
+ SUBMODULE_UPDATE_STRATEGY_INIT, 0, NULL, NULL, NULL, NULL, \
+ STRING_LIST_INIT_DUP, 0}
+
+
+static void next_submodule_warn_missing(struct submodule_update_clone *suc,
+ struct strbuf *out, const char *displaypath)
+{
+ /*
+ * Only mention uninitialized submodules when their
+ * paths have been specified.
+ */
+ if (suc->warn_if_uninitialized) {
+ strbuf_addf(out,
+ _("Submodule path '%s' not initialized"),
+ displaypath);
+ strbuf_addch(out, '\n');
+ strbuf_addstr(out,
+ _("Maybe you want to use 'update --init'?"));
+ strbuf_addch(out, '\n');
+ }
+}
+
+/**
+ * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to
+ * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise.
+ */
+static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
+ struct child_process *child,
+ struct submodule_update_clone *suc,
+ struct strbuf *out)
+{
+ const struct submodule *sub = NULL;
+ struct strbuf displaypath_sb = STRBUF_INIT;
+ struct strbuf sb = STRBUF_INIT;
+ const char *displaypath = NULL;
+ char *url = NULL;
+ int needs_cloning = 0;
+
+ if (ce_stage(ce)) {
+ if (suc->recursive_prefix)
+ strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name);
+ else
+ strbuf_addf(&sb, "%s", ce->name);
+ strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf);
+ strbuf_addch(out, '\n');
+ goto cleanup;
+ }
+
+ sub = submodule_from_path(null_sha1, ce->name);
+
+ if (suc->recursive_prefix)
+ displaypath = relative_path(suc->recursive_prefix,
+ ce->name, &displaypath_sb);
+ else
+ displaypath = ce->name;
+
+ if (!sub) {
+ next_submodule_warn_missing(suc, out, displaypath);
+ goto cleanup;
+ }
+
+ if (suc->update.type == SM_UPDATE_NONE
+ || (suc->update.type == SM_UPDATE_UNSPECIFIED
+ && sub->update_strategy.type == SM_UPDATE_NONE)) {
+ strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
+ strbuf_addch(out, '\n');
+ goto cleanup;
+ }
+
+ /*
+ * Looking up the url in .git/config.
+ * We must not fall back to .gitmodules as we only want
+ * to process configured submodules.
+ */
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "submodule.%s.url", sub->name);
+ git_config_get_string(sb.buf, &url);
+ if (!url) {
+ next_submodule_warn_missing(suc, out, displaypath);
+ goto cleanup;
+ }
+
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "%s/.git", ce->name);
+ needs_cloning = !file_exists(sb.buf);
+
+ strbuf_reset(&sb);
+ strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode,
+ sha1_to_hex(ce->sha1), ce_stage(ce),
+ needs_cloning, ce->name);
+ string_list_append(&suc->projectlines, sb.buf);
+
+ if (!needs_cloning)
+ goto cleanup;
+
+ child->git_cmd = 1;
+ child->no_stdin = 1;
+ child->stdout_to_stderr = 1;
+ child->err = -1;
+ argv_array_push(&child->args, "submodule--helper");
+ argv_array_push(&child->args, "clone");
+ if (suc->quiet)
+ argv_array_push(&child->args, "--quiet");
+ if (suc->prefix)
+ argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
+ 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);
+ if (suc->reference)
+ argv_array_push(&child->args, suc->reference);
+ if (suc->depth)
+ argv_array_push(&child->args, suc->depth);
+
+cleanup:
+ free(url);
+ strbuf_reset(&displaypath_sb);
+ strbuf_reset(&sb);
+
+ return needs_cloning;
+}
+
+static int update_clone_get_next_task(struct child_process *child,
+ struct strbuf *err,
+ void *suc_cb,
+ void **void_task_cb)
+{
+ struct submodule_update_clone *suc = suc_cb;
+
+ for (; suc->current < suc->list.nr; suc->current++) {
+ const struct cache_entry *ce = suc->list.entries[suc->current];
+ if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
+ suc->current++;
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static int update_clone_start_failure(struct strbuf *err,
+ void *suc_cb,
+ void *void_task_cb)
+{
+ struct submodule_update_clone *suc = suc_cb;
+ suc->quickstop = 1;
+ return 1;
+}
+
+static int update_clone_task_finished(int result,
+ struct strbuf *err,
+ void *suc_cb,
+ void *void_task_cb)
+{
+ struct submodule_update_clone *suc = suc_cb;
+
+ if (!result)
+ return 0;
+
+ suc->quickstop = 1;
+ return 1;
+}
+
+static int update_clone(int argc, const char **argv, const char *prefix)
+{
+ const char *update = NULL;
+ int max_jobs = -1;
+ struct string_list_item *item;
+ struct pathspec pathspec;
+ struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
+
+ struct option module_update_clone_options[] = {
+ OPT_STRING(0, "prefix", &prefix,
+ N_("path"),
+ N_("path into the working tree")),
+ OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix,
+ N_("path"),
+ N_("path into the working tree, across nested "
+ "submodule boundaries")),
+ OPT_STRING(0, "update", &update,
+ N_("string"),
+ N_("rebase, merge, checkout or none")),
+ OPT_STRING(0, "reference", &suc.reference, N_("repo"),
+ N_("reference repository")),
+ OPT_STRING(0, "depth", &suc.depth, "<depth>",
+ N_("Create a shallow clone truncated to the "
+ "specified number of revisions")),
+ OPT_INTEGER('j', "jobs", &max_jobs,
+ N_("parallel jobs")),
+ OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
+ OPT_END()
+ };
+
+ const char *const git_submodule_helper_usage[] = {
+ N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"),
+ NULL
+ };
+ suc.prefix = prefix;
+
+ argc = parse_options(argc, argv, prefix, module_update_clone_options,
+ git_submodule_helper_usage, 0);
+
+ if (update)
+ if (parse_submodule_update_strategy(update, &suc.update) < 0)
+ die(_("bad value for update parameter"));
+
+ if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0)
+ return 1;
+
+ if (pathspec.nr)
+ suc.warn_if_uninitialized = 1;
+
+ /* Overlay the parsed .gitmodules file with .git/config */
+ gitmodules_config();
+ git_config(submodule_config, NULL);
+
+ if (max_jobs < 0)
+ max_jobs = parallel_submodules();
+
+ run_processes_parallel(max_jobs,
+ update_clone_get_next_task,
+ update_clone_start_failure,
+ update_clone_task_finished,
+ &suc);
+
+ /*
+ * We saved the output and put it out all at once now.
+ * That means:
+ * - the listener does not have to interleave their (checkout)
+ * work with our fetching. The writes involved in a
+ * checkout involve more straightforward sequential I/O.
+ * - the listener can avoid doing any work if fetching failed.
+ */
+ if (suc.quickstop)
+ return 1;
+
+ for_each_string_list_item(item, &suc.projectlines)
+ utf8_fprintf(stdout, "%s", item->string);
+
+ return 0;
+}
+
+static int resolve_relative_path(int argc, const char **argv, const char *prefix)
+{
+ struct strbuf sb = STRBUF_INIT;
+ if (argc != 3)
+ die("submodule--helper relative_path takes exactly 2 arguments, got %d", argc);
+
+ printf("%s", relative_path(argv[1], argv[2], &sb));
+ strbuf_release(&sb);
+ return 0;
+}
+
struct cmd_struct {
const char *cmd;
int (*fn)(int, const char **, const char *);
@@ -258,19 +851,24 @@ static struct cmd_struct commands[] = {
{"list", module_list},
{"name", module_name},
{"clone", module_clone},
+ {"update-clone", update_clone},
+ {"relative-path", resolve_relative_path},
+ {"resolve-relative-url", resolve_relative_url},
+ {"resolve-relative-url-test", resolve_relative_url_test},
+ {"init", module_init}
};
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
{
int i;
if (argc < 2)
- die(_("fatal: submodule--helper subcommand must be "
+ die(_("submodule--helper subcommand must be "
"called with a subcommand"));
for (i = 0; i < ARRAY_SIZE(commands); i++)
if (!strcmp(argv[1], commands[i].cmd))
return commands[i].fn(argc - 1, argv + 1, prefix);
- die(_("fatal: '%s' is not a valid submodule--helper "
+ die(_("'%s' is not a valid submodule--helper "
"subcommand"), argv[1]);
}
diff --git a/builtin/tag.c b/builtin/tag.c
index 1705c94..50e4ae5 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -29,6 +29,7 @@ static const char * const git_tag_usage[] = {
};
static unsigned int colopts;
+static int force_sign_annotate;
static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format)
{
@@ -104,13 +105,7 @@ static int delete_tag(const char *name, const char *ref,
static int verify_tag(const char *name, const char *ref,
const unsigned char *sha1)
{
- const char *argv_verify_tag[] = {"verify-tag",
- "-v", "SHA1_HEX", NULL};
- argv_verify_tag[2] = sha1_to_hex(sha1);
-
- if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD))
- return error(_("could not verify the tag '%s'"), name);
- return 0;
+ return gpg_verify_tag(sha1, name, GPG_VERIFY_VERBOSE);
}
static int do_sign(struct strbuf *buffer)
@@ -166,6 +161,11 @@ static int git_tag_config(const char *var, const char *value, void *cb)
status = git_gpg_config(var, value, cb);
if (status)
return status;
+ if (!strcmp(var, "tag.forcesignannotated")) {
+ force_sign_annotate = git_config_bool(var, value);
+ return 0;
+ }
+
if (starts_with(var, "column."))
return git_column_config(var, value, "tag", &colopts);
return git_default_config(var, value, cb);
@@ -327,7 +327,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
char *cleanup_arg = NULL;
int create_reflog = 0;
int annotate = 0, force = 0;
- int cmdmode = 0;
+ int cmdmode = 0, create_tag_object = 0;
const char *msgfile = NULL, *keyid = NULL;
struct msg_arg msg = { 0, STRBUF_INIT };
struct ref_transaction *transaction;
@@ -385,12 +385,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
opt.sign = 1;
set_signing_key(keyid);
}
- if (opt.sign)
- annotate = 1;
+ create_tag_object = (opt.sign || annotate || msg.given || msgfile);
+
if (argc == 0 && !cmdmode)
cmdmode = 'l';
- if ((annotate || msg.given || msgfile || force) && (cmdmode != 0))
+ if ((create_tag_object || force) && (cmdmode != 0))
usage_with_options(git_tag_usage, options);
finalize_colopts(&colopts, -1);
@@ -431,7 +431,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
if (msg.given || msgfile) {
if (msg.given && msgfile)
die(_("only one -F or -m option is allowed."));
- annotate = 1;
if (msg.given)
strbuf_addbuf(&buf, &(msg.buf));
else {
@@ -474,8 +473,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
else
die(_("Invalid cleanup mode %s"), cleanup_arg);
- if (annotate)
+ if (create_tag_object) {
+ if (force_sign_annotate && !annotate)
+ opt.sign = 1;
create_tag(object, tag, &buf, &opt, prev, object);
+ }
transaction = ref_transaction_begin(&err);
if (!transaction ||
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 1c94ca5..b8b8522 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -255,7 +255,7 @@ static int process_lstat_error(const char *path, int err)
{
if (err == ENOENT || err == ENOTDIR)
return remove_one_path(path);
- return error("lstat(\"%s\"): %s", path, strerror(errno));
+ return error("lstat(\"%s\"): %s", path, strerror(err));
}
static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index dbfe14f..2caedf1 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -104,8 +104,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
pfd[1].events = POLLIN;
if (poll(pfd, 2, -1) < 0) {
if (errno != EINTR) {
- error("poll failed resuming: %s",
- strerror(errno));
+ error_errno("poll failed resuming");
sleep(1);
}
continue;
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 00663f6..99f8148 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -18,55 +18,6 @@ static const char * const verify_tag_usage[] = {
NULL
};
-static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
-{
- struct signature_check sigc;
- int len;
- int ret;
-
- memset(&sigc, 0, sizeof(sigc));
-
- len = parse_signature(buf, size);
-
- if (size == len) {
- if (flags & GPG_VERIFY_VERBOSE)
- write_in_full(1, buf, len);
- return error("no signature found");
- }
-
- ret = check_signature(buf, len, buf + len, size - len, &sigc);
- print_signature_buffer(&sigc, flags);
-
- signature_check_clear(&sigc);
- return ret;
-}
-
-static int verify_tag(const char *name, unsigned flags)
-{
- enum object_type type;
- unsigned char sha1[20];
- char *buf;
- unsigned long size;
- int ret;
-
- if (get_sha1(name, sha1))
- return error("tag '%s' not found.", name);
-
- type = sha1_object_info(sha1, NULL);
- if (type != OBJ_TAG)
- return error("%s: cannot verify a non-tag object of type %s.",
- name, typename(type));
-
- buf = read_sha1_file(sha1, &type, &size);
- if (!buf)
- return error("%s: unable to read file.", name);
-
- ret = run_gpg_verify(buf, size, flags);
-
- free(buf);
- return ret;
-}
-
static int git_verify_tag_config(const char *var, const char *value, void *cb)
{
int status = git_gpg_config(var, value, cb);
@@ -95,11 +46,13 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
if (verbose)
flags |= GPG_VERIFY_VERBOSE;
- /* sometimes the program was terminated because this signal
- * was received in the process of writing the gpg input: */
- signal(SIGPIPE, SIG_IGN);
- while (i < argc)
- if (verify_tag(argv[i++], flags))
+ while (i < argc) {
+ unsigned char sha1[20];
+ const char *name = argv[i++];
+ if (get_sha1(name, sha1))
+ had_error = !!error("tag '%s' not found.", name);
+ else if (gpg_verify_tag(sha1, name, flags))
had_error = 1;
+ }
return had_error;
}
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 38b5609..96a2834 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -21,6 +21,7 @@ static const char * const worktree_usage[] = {
struct add_opts {
int force;
int detach;
+ int checkout;
const char *new_branch;
int force_new_branch;
};
@@ -109,7 +110,7 @@ static void prune_worktrees(void)
if (ret < 0 && errno == ENOTDIR)
ret = unlink(path.buf);
if (ret)
- error(_("failed to remove: %s"), strerror(errno));
+ error_errno(_("failed to remove '%s'"), path.buf);
}
closedir(dir);
if (!show_only)
@@ -204,7 +205,7 @@ static int add_worktree(const char *path, const char *refname,
if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
ref_exists(symref.buf)) { /* it's a branch */
if (!opts->force)
- die_if_checked_out(symref.buf);
+ die_if_checked_out(symref.buf, 0);
} else { /* must be a commit */
commit = lookup_commit_reference_by_name(refname);
if (!commit)
@@ -284,18 +285,22 @@ static int add_worktree(const char *path, const char *refname,
if (ret)
goto done;
- cp.argv = NULL;
- argv_array_clear(&cp.args);
- argv_array_pushl(&cp.args, "reset", "--hard", NULL);
- cp.env = child_env.argv;
- ret = run_command(&cp);
- if (!ret) {
- is_junk = 0;
- free(junk_work_tree);
- free(junk_git_dir);
- junk_work_tree = NULL;
- junk_git_dir = NULL;
+ if (opts->checkout) {
+ cp.argv = NULL;
+ argv_array_clear(&cp.args);
+ argv_array_pushl(&cp.args, "reset", "--hard", NULL);
+ cp.env = child_env.argv;
+ ret = run_command(&cp);
+ if (ret)
+ goto done;
}
+
+ is_junk = 0;
+ free(junk_work_tree);
+ free(junk_git_dir);
+ junk_work_tree = NULL;
+ junk_git_dir = NULL;
+
done:
strbuf_reset(&sb);
strbuf_addf(&sb, "%s/locked", sb_repo.buf);
@@ -320,10 +325,12 @@ static int add(int ac, const char **av, const char *prefix)
OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
N_("create or reset a branch")),
OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
+ OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
OPT_END()
};
memset(&opts, 0, sizeof(opts));
+ opts.checkout = 1;
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1)
die(_("-b, -B, and --detach are mutually exclusive"));
@@ -342,7 +349,7 @@ static int add(int ac, const char **av, const char *prefix)
if (!opts.force &&
!strbuf_check_branch_ref(&symref, opts.new_branch) &&
ref_exists(symref.buf))
- die_if_checked_out(symref.buf);
+ die_if_checked_out(symref.buf, 0);
strbuf_release(&symref);
}
diff --git a/bundle.c b/bundle.c
index 506ac49..bbf4efa 100644
--- a/bundle.c
+++ b/bundle.c
@@ -435,12 +435,14 @@ int create_bundle(struct bundle_header *header, const char *path,
/* write prerequisites */
if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
- return -1;
+ goto err;
argc = setup_revisions(argc, argv, &revs, NULL);
- if (argc > 1)
- return error(_("unrecognized argument: %s"), argv[1]);
+ if (argc > 1) {
+ error(_("unrecognized argument: %s"), argv[1]);
+ goto err;
+ }
object_array_remove_duplicates(&revs.pending);
@@ -448,17 +450,26 @@ int create_bundle(struct bundle_header *header, const char *path,
if (!ref_count)
die(_("Refusing to create empty bundle."));
else if (ref_count < 0)
- return -1;
+ goto err;
/* write pack */
- if (write_pack_data(bundle_fd, &revs))
- return -1;
+ if (write_pack_data(bundle_fd, &revs)) {
+ bundle_fd = -1; /* already closed by the above call */
+ goto err;
+ }
if (!bundle_to_stdout) {
if (commit_lock_file(&lock))
die_errno(_("cannot create '%s'"), path);
}
return 0;
+err:
+ if (!bundle_to_stdout) {
+ if (0 <= bundle_fd)
+ close(bundle_fd);
+ rollback_lock_file(&lock);
+ }
+ return -1;
}
int unbundle(struct bundle_header *header, int bundle_fd, int flags)
diff --git a/cache-tree.c b/cache-tree.c
index 3ebf9c3..ddf0cc9 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -663,7 +663,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
cnt++;
else {
struct cache_tree_sub *sub;
- struct tree *subtree = lookup_tree(entry.sha1);
+ struct tree *subtree = lookup_tree(entry.oid->hash);
if (!subtree->object.parsed)
parse_tree(subtree);
sub = cache_tree_sub(it, entry.path);
@@ -710,7 +710,7 @@ int cache_tree_matches_traversal(struct cache_tree *root,
it = find_cache_tree_from_traversal(root, info);
it = cache_tree_find(it, ent->path);
- if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1))
+ if (it && it->entry_count > 0 && !hashcmp(ent->oid->hash, it->sha1))
return it->entry_count;
return 0;
}
diff --git a/cache.h b/cache.h
index b829410..6049f86 100644
--- a/cache.h
+++ b/cache.h
@@ -651,10 +651,10 @@ extern int prefer_symlink_refs;
extern int log_all_ref_updates;
extern int warn_ambiguous_refs;
extern int warn_on_object_refname_ambiguity;
-extern int shared_repository;
extern const char *apply_default_whitespace;
extern const char *apply_default_ignorewhitespace;
extern const char *git_attributes_file;
+extern const char *git_hooks_path;
extern int zlib_compression_level;
extern int core_compression_level;
extern int core_compression_seen;
@@ -664,6 +664,9 @@ extern size_t delta_base_cache_limit;
extern unsigned long big_file_threshold;
extern unsigned long pack_size_limit_cfg;
+void set_shared_repository(int value);
+int get_shared_repository(void);
+
/*
* Do replace refs need to be checked this run? This variable is
* initialized to true unless --no-replace-object is used or
@@ -698,6 +701,14 @@ extern int ref_paranoia;
extern char comment_line_char;
extern int auto_comment_line_char;
+/* Windows only */
+enum hide_dotfiles_type {
+ HIDE_DOTFILES_FALSE = 0,
+ HIDE_DOTFILES_TRUE,
+ HIDE_DOTFILES_DOTGITONLY
+};
+extern enum hide_dotfiles_type hide_dotfiles;
+
enum branch_track {
BRANCH_TRACK_UNSPECIFIED = -1,
BRANCH_TRACK_NEVER = 0,
@@ -745,9 +756,39 @@ extern int grafts_replace_parents;
*/
#define GIT_REPO_VERSION 0
#define GIT_REPO_VERSION_READ 1
-extern int repository_format_version;
extern int repository_format_precious_objects;
-extern int check_repository_format(void);
+
+struct repository_format {
+ int version;
+ int precious_objects;
+ int is_bare;
+ char *work_tree;
+ struct string_list unknown_extensions;
+};
+
+/*
+ * Read the repository format characteristics from the config file "path" into
+ * "format" struct. Returns the numeric version. On error, -1 is returned,
+ * format->version is set to -1, and all other fields in the struct are
+ * undefined.
+ */
+int read_repository_format(struct repository_format *format, const char *path);
+
+/*
+ * Verify that the repository described by repository_format is something we
+ * can read. If it is, return 0. Otherwise, return -1, and "err" will describe
+ * any errors encountered.
+ */
+int verify_repository_format(const struct repository_format *format,
+ struct strbuf *err);
+
+/*
+ * Check the repository format version in the path found in get_git_dir(),
+ * and die if it is a version we don't understand. Generally one would
+ * set_git_dir() before calling this, and use it only for "are we in a valid
+ * repo?".
+ */
+extern void check_repository_format(void);
#define MTIME_CHANGED 0x0001
#define CTIME_CHANGED 0x0002
@@ -767,11 +808,14 @@ extern int check_repository_format(void);
*/
extern const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
extern const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+extern const char *git_common_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
+extern void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...)
+ __attribute__((format (printf, 2, 3)));
extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
extern void strbuf_git_path_submodule(struct strbuf *sb, const char *path,
@@ -926,8 +970,6 @@ static inline int is_empty_blob_sha1(const unsigned char *sha1)
int git_mkstemp(char *path, size_t n, const char *template);
-int git_mkstemps(char *path, size_t n, const char *template, int suffix_len);
-
/* set default permissions by passing mode arguments to open(2) */
int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
int git_mkstemp_mode(char *pattern, int mode);
@@ -1124,6 +1166,8 @@ extern int get_sha1_blob(const char *str, unsigned char *sha1);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc);
+extern int get_oid(const char *str, struct object_id *oid);
+
typedef int each_abbrev_fn(const unsigned char *sha1, void *);
extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
@@ -1526,7 +1570,6 @@ extern void git_config(config_fn_t fn, void *);
extern int git_config_with_options(config_fn_t fn, void *,
struct git_config_source *config_source,
int respect_includes);
-extern int git_config_early(config_fn_t fn, void *, const char *repo_config);
extern int git_parse_ulong(const char *, unsigned long *);
extern int git_parse_maybe_bool(const char *);
extern int git_config_int(const char *, const char *);
@@ -1550,7 +1593,6 @@ extern void git_config_set_multivar_in_file(const char *, const char *, const ch
extern int git_config_rename_section(const char *, const char *);
extern int git_config_rename_section_in_file(const char *, const char *, const char *);
extern const char *git_etc_gitconfig(void);
-extern int check_repository_format_version(const char *var, const char *value, void *cb);
extern int git_env_bool(const char *, int);
extern unsigned long git_env_ulong(const char *, unsigned long);
extern int git_config_system(void);
@@ -1736,8 +1778,8 @@ int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int
extern int diff_auto_refresh_index;
/* match-trees.c */
-void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
-void shift_tree_by(const unsigned char *, const unsigned char *, unsigned char *, const char *);
+void shift_tree(const struct object_id *, const struct object_id *, struct object_id *, int);
+void shift_tree_by(const struct object_id *, const struct object_id *, struct object_id *, const char *);
/*
* whitespace rules.
@@ -1771,7 +1813,7 @@ int split_cmdline(char *cmdline, const char ***argv);
/* Takes a negative value returned by split_cmdline */
const char *split_cmdline_strerror(int cmdline_errno);
-/* git.c */
+/* setup.c */
struct startup_info {
int have_repository;
const char *prefix;
diff --git a/check-racy.c b/check-racy.c
index 00d92a1..24b6542 100644
--- a/check-racy.c
+++ b/check-racy.c
@@ -12,7 +12,7 @@ int main(int ac, char **av)
struct stat st;
if (lstat(ce->name, &st)) {
- error("lstat(%s): %s", ce->name, strerror(errno));
+ error_errno("lstat(%s)", ce->name);
continue;
}
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
new file mode 100755
index 0000000..579d540
--- /dev/null
+++ b/ci/test-documentation.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Perform sanity checks on documentation and build it.
+#
+
+set -e
+
+make check-builtins
+make check-docs
+make doc
+
+test -s Documentation/git.html
+test -s Documentation/git.xml
+test -s Documentation/git.1
diff --git a/combine-diff.c b/combine-diff.c
index 0e1d4b0..8f2313d 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1005,8 +1005,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
struct strbuf buf = STRBUF_INIT;
if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) {
- error("readlink(%s): %s", elem->path,
- strerror(errno));
+ error_errno("readlink(%s)", elem->path);
return;
}
result_size = buf.len;
diff --git a/commit.h b/commit.h
index 5d58be0..b06db4d 100644
--- a/commit.h
+++ b/commit.h
@@ -147,6 +147,7 @@ struct pretty_print_context {
int preserve_subject;
struct date_mode date_mode;
unsigned date_mode_explicit:1;
+ int expand_tabs_in_log;
int need_8bit_cte;
char *notes_message;
struct reflog_walk_info *reflog_info;
diff --git a/compat/apple-common-crypto.h b/compat/apple-common-crypto.h
index d3fb264..11727f3 100644
--- a/compat/apple-common-crypto.h
+++ b/compat/apple-common-crypto.h
@@ -3,12 +3,18 @@
#define HEADER_HMAC_H
#define HEADER_SHA_H
#include <CommonCrypto/CommonHMAC.h>
-#define HMAC_CTX CCHmacContext
-#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len)
-#define HMAC_Update CCHmacUpdate
-#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash)
-#define HMAC_CTX_cleanup(ignore)
#define EVP_md5(...) kCCHmacAlgMD5
+/* CCHmac doesn't take md_len and the return type is void */
+#define HMAC git_CC_HMAC
+static inline unsigned char *git_CC_HMAC(CCHmacAlgorithm alg,
+ const void *key, int key_len,
+ const unsigned char *data, size_t data_len,
+ unsigned char *md, unsigned int *md_len)
+{
+ CCHmac(alg, key, key_len, data, data_len, md);
+ return md;
+}
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#define APPLE_LION_OR_NEWER
#include <Security/Security.h>
diff --git a/compat/mingw.c b/compat/mingw.c
index 54c82ec..a8218e6 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -286,6 +286,49 @@ int mingw_rmdir(const char *pathname)
return ret;
}
+static inline int needs_hiding(const char *path)
+{
+ const char *basename;
+
+ if (hide_dotfiles == HIDE_DOTFILES_FALSE)
+ return 0;
+
+ /* We cannot use basename(), as it would remove trailing slashes */
+ mingw_skip_dos_drive_prefix((char **)&path);
+ if (!*path)
+ return 0;
+
+ for (basename = path; *path; path++)
+ if (is_dir_sep(*path)) {
+ do {
+ path++;
+ } while (is_dir_sep(*path));
+ /* ignore trailing slashes */
+ if (*path)
+ basename = path;
+ }
+
+ if (hide_dotfiles == HIDE_DOTFILES_TRUE)
+ return *basename == '.';
+
+ assert(hide_dotfiles == HIDE_DOTFILES_DOTGITONLY);
+ return !strncasecmp(".git", basename, 4) &&
+ (!basename[4] || is_dir_sep(basename[4]));
+}
+
+static int set_hidden_flag(const wchar_t *path, int set)
+{
+ DWORD original = GetFileAttributesW(path), modified;
+ if (set)
+ modified = original | FILE_ATTRIBUTE_HIDDEN;
+ else
+ modified = original & ~FILE_ATTRIBUTE_HIDDEN;
+ if (original == modified || SetFileAttributesW(path, modified))
+ return 0;
+ errno = err_win_to_posix(GetLastError());
+ return -1;
+}
+
int mingw_mkdir(const char *path, int mode)
{
int ret;
@@ -293,6 +336,8 @@ int mingw_mkdir(const char *path, int mode)
if (xutftowcs_path(wpath, path) < 0)
return -1;
ret = _wmkdir(wpath);
+ if (!ret && needs_hiding(path))
+ return set_hidden_flag(wpath, 1);
return ret;
}
@@ -319,6 +364,21 @@ int mingw_open (const char *filename, int oflags, ...)
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
errno = EISDIR;
}
+ if ((oflags & O_CREAT) && needs_hiding(filename)) {
+ /*
+ * Internally, _wopen() uses the CreateFile() API which errors
+ * out with an ERROR_ACCESS_DENIED if CREATE_ALWAYS was
+ * specified and an already existing file's attributes do not
+ * match *exactly*. As there is no mode or flag we can set that
+ * would correspond to FILE_ATTRIBUTE_HIDDEN, let's just try
+ * again *without* the O_CREAT flag (that corresponds to the
+ * CREATE_ALWAYS flag of CreateFile()).
+ */
+ if (fd < 0 && errno == EACCES)
+ fd = _wopen(wfilename, oflags & ~O_CREAT, mode);
+ if (fd >= 0 && set_hidden_flag(wfilename, 1))
+ warning("could not mark '%s' as hidden.", filename);
+ }
return fd;
}
@@ -350,6 +410,7 @@ int mingw_fgetc(FILE *stream)
#undef fopen
FILE *mingw_fopen (const char *filename, const char *otype)
{
+ int hide = needs_hiding(filename);
FILE *file;
wchar_t wfilename[MAX_PATH], wotype[4];
if (filename && !strcmp(filename, "/dev/null"))
@@ -357,12 +418,19 @@ FILE *mingw_fopen (const char *filename, const char *otype)
if (xutftowcs_path(wfilename, filename) < 0 ||
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;
+ }
file = _wfopen(wfilename, wotype);
+ if (file && hide && set_hidden_flag(wfilename, 1))
+ warning("could not mark '%s' as hidden.", filename);
return file;
}
FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
{
+ int hide = needs_hiding(filename);
FILE *file;
wchar_t wfilename[MAX_PATH], wotype[4];
if (filename && !strcmp(filename, "/dev/null"))
@@ -370,7 +438,13 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
if (xutftowcs_path(wfilename, filename) < 0 ||
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;
+ }
file = _wfreopen(wfilename, wotype, stream);
+ if (file && hide && set_hidden_flag(wfilename, 1))
+ warning("could not mark '%s' as hidden.", filename);
return file;
}
@@ -763,15 +837,12 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
char *mingw_getcwd(char *pointer, int len)
{
- int i;
wchar_t wpointer[MAX_PATH];
if (!_wgetcwd(wpointer, ARRAY_SIZE(wpointer)))
return NULL;
if (xwcstoutf(pointer, wpointer, len) < 0)
return NULL;
- for (i = 0; pointer[i]; i++)
- if (pointer[i] == '\\')
- pointer[i] = '/';
+ convert_slashes(pointer);
return pointer;
}
@@ -2112,9 +2183,7 @@ static void setup_windows_environment()
* executable (by not mistaking the dir separators
* for escape characters).
*/
- for (; *tmp; tmp++)
- if (*tmp == '\\')
- *tmp = '/';
+ convert_slashes(tmp);
}
/* simulate TERM to enable auto-color (see color.c) */
diff --git a/compat/mingw.h b/compat/mingw.h
index c008694..69bb43d 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -142,6 +142,7 @@ static inline int fcntl(int fd, int cmd, ...)
#define sigemptyset(x) (void)0
static inline int sigaddset(sigset_t *set, int signum)
{ return 0; }
+#define SIG_BLOCK 0
#define SIG_UNBLOCK 0
static inline int sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
{ return 0; }
@@ -406,7 +407,7 @@ static inline void convert_slashes(char *path)
int mingw_offset_1st_component(const char *path);
#define offset_1st_component mingw_offset_1st_component
#define PATH_SEP ';'
-#ifndef __MINGW64_VERSION_MAJOR
+#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
#define PRIuMAX "I64u"
#define PRId64 "I64d"
#else
@@ -416,9 +417,6 @@ int mingw_offset_1st_component(const char *path);
void mingw_open_html(const char *path);
#define open_html mingw_open_html
-void mingw_mark_as_git_dir(const char *dir);
-#define mark_as_git_dir mingw_mark_as_git_dir
-
/**
* Converts UTF-8 encoded string to UTF-16LE.
*
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index dfbe6d8..4293b53 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -147,7 +147,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)
if (errno || inleft) {
/*
* iconv() failed and errno could be E2BIG, EILSEQ, EINVAL, EBADF
- * MacOS X avoids illegal byte sequemces.
+ * MacOS X avoids illegal byte sequences.
* If they occur on a mounted drive (e.g. NFS) it is not worth to
* die() for that, but rather let the user see the original name
*/
diff --git a/compat/snprintf.c b/compat/snprintf.c
index 42ea1ac..0b11688 100644
--- a/compat/snprintf.c
+++ b/compat/snprintf.c
@@ -9,7 +9,7 @@
* always have room for a trailing NUL byte.
*/
#ifndef SNPRINTF_SIZE_CORR
-#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4)
+#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) && (!defined(_MSC_VER) || _MSC_VER < 1900)
#define SNPRINTF_SIZE_CORR 1
#else
#define SNPRINTF_SIZE_CORR 0
diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h
index c65c2cd..3a959d1 100644
--- a/compat/vcbuild/include/unistd.h
+++ b/compat/vcbuild/include/unistd.h
@@ -45,11 +45,15 @@ typedef unsigned long long uintmax_t;
typedef int64_t off64_t;
+#if !defined(_MSC_VER) || _MSC_VER < 1600
#define INTMAX_MIN _I64_MIN
#define INTMAX_MAX _I64_MAX
#define UINTMAX_MAX _UI64_MAX
#define UINT32_MAX 0xffffffff /* 4294967295U */
+#else
+#include <stdint.h>
+#endif
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index b6ed9e7..1c16408 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -104,4 +104,11 @@ static inline void *pthread_getspecific(pthread_key_t key)
return TlsGetValue(key);
}
+#ifndef __MINGW64_VERSION_MAJOR
+static inline int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
+{
+ return 0;
+}
+#endif
+
#endif /* PTHREAD_H */
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c
index b905aea..6c7c9b6 100644
--- a/compat/win32/syslog.c
+++ b/compat/win32/syslog.c
@@ -28,13 +28,13 @@ void syslog(int priority, const char *fmt, ...)
va_end(ap);
if (str_len < 0) {
- warning("vsnprintf failed: '%s'", strerror(errno));
+ warning_errno("vsnprintf failed");
return;
}
str = malloc(st_add(str_len, 1));
if (!str) {
- warning("malloc failed: '%s'", strerror(errno));
+ warning_errno("malloc failed");
return;
}
@@ -45,7 +45,7 @@ void syslog(int priority, const char *fmt, ...)
while ((pos = strstr(str, "%1")) != NULL) {
str = realloc(str, st_add(++str_len, 1));
if (!str) {
- warning("realloc failed: '%s'", strerror(errno));
+ warning_errno("realloc failed");
return;
}
memmove(pos + 2, pos + 1, strlen(pos));
diff --git a/compat/win32mmap.c b/compat/win32mmap.c
index 80a8c9a..519d51f 100644
--- a/compat/win32mmap.c
+++ b/compat/win32mmap.c
@@ -2,37 +2,42 @@
void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
{
- HANDLE hmap;
+ HANDLE osfhandle, hmap;
void *temp;
- off_t len;
- struct stat st;
+ LARGE_INTEGER len;
uint64_t o = offset;
uint32_t l = o & 0xFFFFFFFF;
uint32_t h = (o >> 32) & 0xFFFFFFFF;
- if (!fstat(fd, &st))
- len = st.st_size;
- else
+ osfhandle = (HANDLE)_get_osfhandle(fd);
+ if (!GetFileSizeEx(osfhandle, &len))
die("mmap: could not determine filesize");
- if ((length + offset) > len)
- length = xsize_t(len - offset);
+ if ((length + offset) > len.QuadPart)
+ length = xsize_t(len.QuadPart - offset);
if (!(flags & MAP_PRIVATE))
die("Invalid usage of mmap when built with USE_WIN32_MMAP");
- hmap = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL,
- PAGE_WRITECOPY, 0, 0, NULL);
+ hmap = CreateFileMapping(osfhandle, NULL,
+ prot == PROT_READ ? PAGE_READONLY : PAGE_WRITECOPY, 0, 0, NULL);
- if (!hmap)
+ if (!hmap) {
+ errno = EINVAL;
return MAP_FAILED;
+ }
- temp = MapViewOfFileEx(hmap, FILE_MAP_COPY, h, l, length, start);
+ temp = MapViewOfFileEx(hmap, prot == PROT_READ ?
+ FILE_MAP_READ : FILE_MAP_COPY, h, l, length, start);
if (!CloseHandle(hmap))
warning("unable to close file mapping handle");
- return temp ? temp : MAP_FAILED;
+ if (temp)
+ return temp;
+
+ errno = GetLastError() == ERROR_COMMITMENT_LIMIT ? EFBIG : EINVAL;
+ return MAP_FAILED;
}
int git_munmap(void *start, size_t length)
diff --git a/compat/winansi.c b/compat/winansi.c
index 5dfa5ed..3be60ce 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -483,6 +483,7 @@ static size_t sizeof_ioinfo = 0;
#define IOINFO_L2E 5
#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E)
+#define FPIPE 0x08
#define FDEV 0x40
static inline ioinfo* _pioinfo(int fd)
@@ -530,6 +531,45 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
return old_handle;
}
+#ifdef DETECT_MSYS_TTY
+
+#include <winternl.h>
+#include <ntstatus.h>
+
+static void detect_msys_tty(int fd)
+{
+ ULONG result;
+ BYTE buffer[1024];
+ POBJECT_NAME_INFORMATION nameinfo = (POBJECT_NAME_INFORMATION) buffer;
+ PWSTR name;
+
+ /* check if fd is a pipe */
+ HANDLE h = (HANDLE) _get_osfhandle(fd);
+ if (GetFileType(h) != FILE_TYPE_PIPE)
+ return;
+
+ /* get pipe name */
+ if (!NT_SUCCESS(NtQueryObject(h, ObjectNameInformation,
+ buffer, sizeof(buffer) - 2, &result)))
+ return;
+ name = nameinfo->Name.Buffer;
+ name[nameinfo->Name.Length] = 0;
+
+ /* check if this could be a MSYS2 pty pipe ('msys-XXXX-ptyN-XX') */
+ if (!wcsstr(name, L"msys-") || !wcsstr(name, L"-pty"))
+ return;
+
+ /* init ioinfo size if we haven't done so */
+ if (init_sizeof_ioinfo())
+ return;
+
+ /* set FDEV flag, reset FPIPE flag */
+ _pioinfo(fd)->osflags &= ~FPIPE;
+ _pioinfo(fd)->osflags |= FDEV;
+}
+
+#endif
+
void winansi_init(void)
{
int con1, con2;
@@ -538,8 +578,15 @@ void winansi_init(void)
/* check if either stdout or stderr is a console output screen buffer */
con1 = is_console(1);
con2 = is_console(2);
- if (!con1 && !con2)
+ if (!con1 && !con2) {
+#ifdef DETECT_MSYS_TTY
+ /* check if stdin / stdout / stderr are MSYS2 pty pipes */
+ detect_msys_tty(0);
+ detect_msys_tty(1);
+ detect_msys_tty(2);
+#endif
return;
+ }
/* create a named pipe to communicate with the console thread */
xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId());
@@ -575,8 +622,11 @@ void winansi_init(void)
HANDLE winansi_get_osfhandle(int fd)
{
HANDLE hnd = (HANDLE) _get_osfhandle(fd);
- if ((fd == 1 || fd == 2) && isatty(fd)
- && GetFileType(hnd) == FILE_TYPE_PIPE)
- return (fd == 1) ? hconsole1 : hconsole2;
+ if (isatty(fd) && GetFileType(hnd) == FILE_TYPE_PIPE) {
+ if (fd == 1 && hconsole1)
+ return hconsole1;
+ else if (fd == 2 && hconsole2)
+ return hconsole2;
+ }
return hnd;
}
diff --git a/config.c b/config.c
index 9ba40bc..f51c56b 100644
--- a/config.c
+++ b/config.c
@@ -108,7 +108,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
expanded = expand_user_path(path);
if (!expanded)
- return error("Could not expand include path '%s'", path);
+ return error("could not expand include path '%s'", path);
path = expanded;
/*
@@ -162,7 +162,7 @@ void git_config_push_parameter(const char *text)
{
struct strbuf env = STRBUF_INIT;
const char *old = getenv(CONFIG_DATA_ENVIRONMENT);
- if (old) {
+ if (old && *old) {
strbuf_addstr(&env, old);
strbuf_addch(&env, ' ');
}
@@ -717,6 +717,9 @@ static int git_default_core_config(const char *var, const char *value)
if (!strcmp(var, "core.attributesfile"))
return git_config_pathname(&git_attributes_file, var, value);
+ if (!strcmp(var, "core.hookspath"))
+ return git_config_pathname(&git_hooks_path, var, value);
+
if (!strcmp(var, "core.bare")) {
is_bare_repository_cfg = git_config_bool(var, value);
return 0;
@@ -803,8 +806,6 @@ static int git_default_core_config(const char *var, const char *value)
if (!strcmp(var, "core.autocrlf")) {
if (value && !strcasecmp(value, "input")) {
- if (core_eol == EOL_CRLF)
- return error("core.autocrlf=input conflicts with core.eol=crlf");
auto_crlf = AUTO_CRLF_INPUT;
return 0;
}
@@ -830,8 +831,6 @@ static int git_default_core_config(const char *var, const char *value)
core_eol = EOL_NATIVE;
else
core_eol = EOL_UNSET;
- if (core_eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT)
- return error("core.autocrlf=input conflicts with core.eol=crlf");
return 0;
}
@@ -912,6 +911,14 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.hidedotfiles")) {
+ if (value && !strcasecmp(value, "dotgitonly"))
+ hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
+ else
+ hide_dotfiles = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}
@@ -950,7 +957,7 @@ static int git_default_branch_config(const char *var, const char *value)
else if (!strcmp(value, "always"))
autorebase = AUTOREBASE_ALWAYS;
else
- return error("Malformed value for %s", var);
+ return error("malformed value for %s", var);
return 0;
}
@@ -976,7 +983,7 @@ static int git_default_push_config(const char *var, const char *value)
else if (!strcmp(value, "current"))
push_default = PUSH_DEFAULT_CURRENT;
else {
- error("Malformed value for %s: %s", var, value);
+ error("malformed value for %s: %s", var, value);
return error("Must be one of nothing, matching, simple, "
"upstream or current.");
}
@@ -1188,11 +1195,12 @@ int git_config_system(void)
return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
}
-int git_config_early(config_fn_t fn, void *data, const char *repo_config)
+static int do_git_config_sequence(config_fn_t fn, void *data)
{
int ret = 0, found = 0;
char *xdg_config = xdg_config_home("config");
char *user_config = expand_user_path("~/.gitconfig");
+ char *repo_config = git_pathdup("config");
if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
ret += git_config_from_file(fn, git_etc_gitconfig(),
@@ -1228,6 +1236,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
free(xdg_config);
free(user_config);
+ free(repo_config);
return ret == 0 ? found : ret;
}
@@ -1235,8 +1244,6 @@ int git_config_with_options(config_fn_t fn, void *data,
struct git_config_source *config_source,
int respect_includes)
{
- char *repo_config = NULL;
- int ret;
struct config_include_data inc = CONFIG_INCLUDE_INIT;
if (respect_includes) {
@@ -1257,11 +1264,7 @@ int git_config_with_options(config_fn_t fn, void *data,
else if (config_source && config_source->blob)
return git_config_from_blob_ref(fn, config_source->blob, data);
- repo_config = git_pathdup("config");
- ret = git_config_early(fn, data, repo_config);
- if (repo_config)
- free(repo_config);
- return ret;
+ return do_git_config_sequence(fn, data);
}
static void git_config_raw(config_fn_t fn, void *data)
@@ -1313,14 +1316,11 @@ static struct config_set_element *configset_find_element(struct config_set *cs,
struct config_set_element k;
struct config_set_element *found_entry;
char *normalized_key;
- int ret;
/*
* `key` may come from the user, so normalize it before using it
* for querying entries from the hashmap.
*/
- ret = git_config_parse_key(key, &normalized_key, NULL);
-
- if (ret)
+ if (git_config_parse_key(key, &normalized_key, NULL))
return NULL;
hashmap_entry_init(&k, strhash(normalized_key));
@@ -2016,7 +2016,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
lock = xcalloc(1, sizeof(struct lock_file));
fd = hold_lock_file_for_update(lock, config_filename, 0);
if (fd < 0) {
- error("could not lock config file %s: %s", config_filename, strerror(errno));
+ error_errno("could not lock config file %s", config_filename);
free(store.key);
ret = CONFIG_NO_LOCK;
goto out_free;
@@ -2030,8 +2030,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
free(store.key);
if ( ENOENT != errno ) {
- error("opening %s: %s", config_filename,
- strerror(errno));
+ error_errno("opening %s", config_filename);
ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */
goto out_free;
}
@@ -2115,8 +2114,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (contents == MAP_FAILED) {
if (errno == ENODEV && S_ISDIR(st.st_mode))
errno = EISDIR;
- error("unable to mmap '%s': %s",
- config_filename, strerror(errno));
+ error_errno("unable to mmap '%s'", config_filename);
ret = CONFIG_INVALID_FILE;
contents = NULL;
goto out_free;
@@ -2125,8 +2123,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
in_fd = -1;
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
- error("chmod on %s failed: %s",
- get_lock_file_path(lock), strerror(errno));
+ error_errno("chmod on %s failed", get_lock_file_path(lock));
ret = CONFIG_NO_WRITE;
goto out_free;
}
@@ -2182,8 +2179,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
}
if (commit_lock_file(lock) < 0) {
- error("could not write config file %s: %s", config_filename,
- strerror(errno));
+ error_errno("could not write config file %s", config_filename);
ret = CONFIG_NO_WRITE;
lock = NULL;
goto out_free;
@@ -2221,9 +2217,13 @@ void git_config_set_multivar_in_file(const char *config_filename,
const char *key, const char *value,
const char *value_regex, int multi_replace)
{
- if (git_config_set_multivar_in_file_gently(config_filename, key, value,
- value_regex, multi_replace) < 0)
- die(_("Could not set '%s' to '%s'"), key, value);
+ if (!git_config_set_multivar_in_file_gently(config_filename, key, value,
+ value_regex, multi_replace))
+ return;
+ if (value)
+ die(_("could not set '%s' to '%s'"), key, value);
+ else
+ die(_("could not unset '%s'"), key);
}
int git_config_set_multivar_gently(const char *key, const char *value,
@@ -2330,8 +2330,8 @@ int git_config_rename_section_in_file(const char *config_filename,
fstat(fileno(config_file), &st);
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
- ret = error("chmod on %s failed: %s",
- get_lock_file_path(lock), strerror(errno));
+ ret = error_errno("chmod on %s failed",
+ get_lock_file_path(lock));
goto out;
}
@@ -2385,8 +2385,8 @@ int git_config_rename_section_in_file(const char *config_filename,
fclose(config_file);
unlock_and_out:
if (commit_lock_file(lock) < 0)
- ret = error("could not write config file %s: %s",
- config_filename, strerror(errno));
+ ret = error_errno("could not write config file %s",
+ config_filename);
out:
free(filename_buf);
return ret;
@@ -2404,7 +2404,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
#undef config_error_nonbool
int config_error_nonbool(const char *var)
{
- return error("Missing value for '%s'", var);
+ return error("missing value for '%s'", var);
}
int parse_config_key(const char *var,
diff --git a/config.mak.uname b/config.mak.uname
index fe8096f..a88f139 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -187,6 +187,7 @@ ifeq ($(uname_O),Cygwin)
X = .exe
UNRELIABLE_FSTAT = UnfortunatelyYes
SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
+ OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
endif
ifeq ($(uname_S),FreeBSD)
NEEDS_LIBICONV = YesPlease
@@ -556,7 +557,8 @@ else
BASIC_LDFLAGS += -Wl,--large-address-aware
endif
CC = gcc
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY
+ EXTLIBS += -lntdll
INSTALL = /bin/install
NO_R_TO_GCC_LINKER = YesPlease
INTERNAL_QSORT = YesPlease
diff --git a/configure.ac b/configure.ac
index 0cd9f46..c279025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -970,10 +970,6 @@ AC_CHECK_LIB([iconv], [locale_charset],
[CHARSET_LIB=-lcharset])])
GIT_CONF_SUBST([CHARSET_LIB])
#
-# Define NO_HMAC_CTX_CLEANUP=YesPlease if HMAC_CTX_cleanup is missing.
-AC_CHECK_LIB([crypto], [HMAC_CTX_cleanup],
- [], [GIT_CONF_SUBST([NO_HMAC_CTX_CLEANUP], [YesPlease])])
-#
# Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
GIT_CHECK_FUNC(clock_gettime,
[HAVE_CLOCK_GETTIME=YesPlease],
diff --git a/connected.c b/connected.c
index 299c560..bf1b12e 100644
--- a/connected.c
+++ b/connected.c
@@ -86,17 +86,14 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
memcpy(commit, sha1_to_hex(sha1), 40);
if (write_in_full(rev_list.in, commit, 41) < 0) {
if (errno != EPIPE && errno != EINVAL)
- error(_("failed write to rev-list: %s"),
- strerror(errno));
+ error_errno(_("failed write to rev-list"));
err = -1;
break;
}
} while (!fn(cb_data, sha1));
- if (close(rev_list.in)) {
- error(_("failed to close rev-list's stdin: %s"), strerror(errno));
- err = -1;
- }
+ if (close(rev_list.in))
+ err = error_errno(_("failed to close rev-list's stdin"));
sigchain_pop(SIGPIPE);
return finish_command(&rev_list) || err;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e3918c8..3402475 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1339,15 +1339,15 @@ _git_help ()
{
case "$cur" in
--*)
- __gitcomp "--all --info --man --web"
+ __gitcomp "--all --guides --info --man --web"
return
;;
esac
__git_compute_all_commands
__gitcomp "$__git_all_commands $(__git_aliases)
attributes cli core-tutorial cvs-migration
- diffcore gitk glossary hooks ignore modules
- namespaces repository-layout tutorial tutorial-2
+ diffcore everyday gitk glossary hooks ignore modules
+ namespaces repository-layout revisions tutorial tutorial-2
workflows
"
}
@@ -1458,6 +1458,7 @@ _git_log ()
--relative-date --date=
--pretty= --format= --oneline
--show-signature
+ --cherry-mark
--cherry-pick
--graph
--decorate --decorate=
diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index bc77e66..100cc7a 100644
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,46 @@
+Release 1.3.1 (bugfix-only release)
+===================================
+
+* Generate links to commits in combined emails (it was done only for
+ commit emails in 1.3.0).
+
+* Fix broken links on PyPi.
+
+Release 1.3.0
+=============
+
+* New options multimailhook.htmlInIntro and multimailhook.htmlInFooter
+ now allow using HTML in the introduction and footer of emails (e.g.
+ for a more pleasant formatting or to insert a link to the commit on
+ a web interface).
+
+* A new option multimailhook.commitBrowseURL gives a simpler (and less
+ flexible) way to add a link to a web interface for commit emails
+ than multimailhook.htmlInIntro and multimailhook.htmlInFooter.
+
+* A new public function config.add_config_parameters was added to
+ allow custom hooks to set specific Git configuration variables
+ without modifying the configuration files. See an example in
+ post-receive.example.
+
+* Error handling for SMTP has been improved (we used to print Python
+ backtraces for legitimate errors).
+
+* The SMTP mailer can now check TLS certificates when the newly added
+ configuration variable multimailhook.smtpCACerts.
+
+* Python 3 portability has been improved.
+
+* The documentation's formatting has been improved.
+
+* The testsuite has been improved (we now use pyflakes to check for
+ errors in the code).
+
+This version has been tested with Python 2.4 and 2.6 to 3.5, and Git
+v1.7.10-406-gdc801e7, 2.1.4 and 2.8.1.339.g3ad15fd.
+
+No change since 1.3 RC1.
+
Release 1.2.0
=============
diff --git a/contrib/hooks/multimail/CONTRIBUTING.rst b/contrib/hooks/multimail/CONTRIBUTING.rst
index 09efdb0..530ecbf 100644
--- a/contrib/hooks/multimail/CONTRIBUTING.rst
+++ b/contrib/hooks/multimail/CONTRIBUTING.rst
@@ -1,3 +1,6 @@
+Contributing
+============
+
git-multimail is an open-source project, built by volunteers. We would
welcome your help!
@@ -6,9 +9,7 @@ and Matthieu Moy <matthieu.moy@grenoble-inp.fr>.
Please note that although a copy of git-multimail is distributed in
the "contrib" section of the main Git project, development takes place
-in a separate git-multimail repository on GitHub:
-
- https://github.com/git-multimail/git-multimail
+in a separate `git-multimail repository on GitHub`_.
Whenever enough changes to git-multimail have accumulated, a new
code-drop of git-multimail will be submitted for inclusion in the Git
@@ -21,10 +22,12 @@ to the maintainers). Please sign off your patches as per the `Git
project practice
<https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L234>`__.
-General discussion of git-multimail can take place on the main Git
-mailing list,
-
- git@vger.kernel.org
+General discussion of git-multimail can take place on the main `Git
+mailing list`_.
Please CC emails regarding git-multimail to the maintainers so that we
don't overlook them.
+
+
+.. _`git-multimail repository on GitHub`: https://github.com/git-multimail/git-multimail
+.. _`Git mailing list`: git@vger.kernel.org
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 5512068..0c91d19 100644
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -1,5 +1,5 @@
-git-multimail (version 1.2.0)
-=============================
+git-multimail 1.3.1
+===================
.. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
:target: https://travis-ci.org/git-multimail/git-multimail
@@ -127,6 +127,13 @@ changes of this type, please consider sharing them with the
community.)
+Troubleshooting/FAQ
+-------------------
+
+Please read `<doc/troubleshooting.rst>`__ for frequently asked
+questions and common issues with git-multimail.
+
+
Configuration
-------------
@@ -134,19 +141,16 @@ By default, git-multimail mostly takes its configuration from the
following ``git config`` settings:
multimailhook.environment
-
This describes the general environment of the repository. In most
cases, you do not need to specify a value for this variable:
`git-multimail` will autodetect which environment to use.
Currently supported values:
- * generic
-
+ generic
the username of the pusher is read from $USER or $USERNAME and
the repository name is derived from the repository's path.
- * gitolite
-
+ gitolite
the username of the pusher is read from $GL_USER, the repository
name is read from $GL_REPO, and the From: header value is
optionally read from gitolite.conf (see multimailhook.from).
@@ -154,8 +158,7 @@ multimailhook.environment
For more information about gitolite and git-multimail, read
`<doc/gitolite.rst>`__
- * stash
-
+ stash
Environment to use when ``git-multimail`` is ran as an Atlassian
BitBucket Server (formerly known as Atlassian Stash) hook.
@@ -169,8 +172,7 @@ multimailhook.environment
and repo come from these two command line flags, which must be
specified.
- * gerrit
-
+ gerrit
Environment to use when ``git-multimail`` is ran as a
``ref-updated`` Gerrit hook.
@@ -205,14 +207,12 @@ multimailhook.environment
* If none of the above apply, then ``generic`` is used.
multimailhook.repoName
-
A short name of this Git repository, to be used in various places
in the notification email text. The default is to use $GL_REPO
for gitolite repositories, or otherwise to derive this value from
the repository path name.
multimailhook.mailingList
-
The list of email addresses to which notification emails should be
sent, as RFC 2822 email addresses separated by commas. This
configuration option can be multivalued. Leave it unset or set it
@@ -221,7 +221,6 @@ multimailhook.mailingList
specific types of notification email.
multimailhook.refchangeList
-
The list of email addresses to which summary emails about
reference changes should be sent, as RFC 2822 email addresses
separated by commas. This configuration option can be
@@ -231,7 +230,6 @@ multimailhook.refchangeList
multimailhook.mailingList is set.
multimailhook.announceList
-
The list of email addresses to which emails about new annotated
tags should be sent, as RFC 2822 email addresses separated by
commas. This configuration option can be multivalued. The
@@ -241,7 +239,6 @@ multimailhook.announceList
even if one of the other values is set.
multimailhook.commitList
-
The list of email addresses to which emails about individual new
commits should be sent, as RFC 2822 email addresses separated by
commas. This configuration option can be multivalued. The
@@ -251,7 +248,6 @@ multimailhook.commitList
multimailhook.mailingList is set.
multimailhook.announceShortlog
-
If this option is set to true, then emails about changes to
annotated tags include a shortlog of changes since the previous
tag. This can be useful if the annotated tags represent releases;
@@ -261,7 +257,6 @@ multimailhook.announceShortlog
rather than useful. Default is false.
multimailhook.commitEmailFormat
-
The format of email messages for the individual commits, can be "text" or
"html". In the latter case, the emails will include diffs using colorized
HTML instead of plain text used by default. Note that this currently the
@@ -274,8 +269,43 @@ multimailhook.commitEmailFormat
the message starting with ``+++`` or ``---`` colored in red or
green).
-multimailhook.refchangeShowGraph
+ By default, all the message is HTML-escaped. See
+ ``multimailhook.htmlInIntro`` to change this behavior.
+
+multimailhook.commitBrowseURL
+ Used to generate a link to an online repository browser in commit
+ emails. This variable must be a string. Format directives like
+ ``%(<variable>)s`` will be expanded the same way as template
+ strings. In particular, ``%(id)s`` will be replaced by the full
+ Git commit identifier (40-chars hexadecimal).
+
+ If the string does not contain any format directive, then
+ ``%(id)s`` will be automatically added to the string. If you don't
+ want ``%(id)s`` to be automatically added, use the empty format
+ directive ``%()s`` anywhere in the string.
+
+ For example, a suitable value for the git-multimail project itself
+ would be
+ ``https://github.com/git-multimail/git-multimail/commit/%(id)s``.
+
+multimailhook.htmlInIntro, multimailhook.htmlInFooter
+ When generating an HTML message, git-multimail escapes any HTML
+ sequence by default. This means that if a template contains HTML
+ like ``<a href="foo">link</a>``, the reader will see the HTML
+ source code and not a proper link.
+
+ Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
+ formatting in introduction templates. Similarly, set
+ ``multimailhook.htmlInFooter`` for HTML in the footer.
+ Variables expanded in the template are still escaped. For example,
+ if a repository's path contains a ``<``, it will be rendered as
+ such in the message.
+
+ Read `<doc/customizing-emails.rst>`__ for more details and
+ examples.
+
+multimailhook.refchangeShowGraph
If this option is set to true, then summary emails about reference
changes will additionally include:
@@ -287,7 +317,6 @@ multimailhook.refchangeShowGraph
specified in graphOpts. The default is false.
multimailhook.refchangeShowLog
-
If this option is set to true, then summary emails about reference
changes will include a detailed log of the added commits in
addition to the one line summary. The log is generated by running
@@ -295,71 +324,80 @@ multimailhook.refchangeShowLog
Default is false.
multimailhook.mailer
-
This option changes the way emails are sent. Accepted values are:
- - sendmail (the default): use the command ``/usr/sbin/sendmail`` or
+ * **sendmail (the default)**: use the command ``/usr/sbin/sendmail`` or
``/usr/lib/sendmail`` (or sendmailCommand, if configured). This
mode can be further customized via the following options:
- * multimailhook.sendmailCommand
-
- The command used by mailer ``sendmail`` to send emails. Shell
- quoting is allowed in the value of this setting, but remember that
- Git requires double-quotes to be escaped; e.g.::
+ multimailhook.sendmailCommand
+ The command used by mailer ``sendmail`` to send emails. Shell
+ quoting is allowed in the value of this setting, but remember that
+ Git requires double-quotes to be escaped; e.g.::
- git config multimailhook.sendmailcommand '/usr/sbin/sendmail -oi -t -F \"Git Repo\"'
+ git config multimailhook.sendmailcommand '/usr/sbin/sendmail -oi -t -F \"Git Repo\"'
- Default is '/usr/sbin/sendmail -oi -t' or
- '/usr/lib/sendmail -oi -t' (depending on which file is
- present and executable).
+ Default is '/usr/sbin/sendmail -oi -t' or
+ '/usr/lib/sendmail -oi -t' (depending on which file is
+ present and executable).
- * multimailhook.envelopeSender
+ multimailhook.envelopeSender
+ If set then pass this value to sendmail via the -f option to set
+ the envelope sender address.
- If set then pass this value to sendmail via the -f option to set
- the envelope sender address.
-
- - smtp: use Python's smtplib. This is useful when the sendmail
+ * **smtp**: use Python's smtplib. This is useful when the sendmail
command is not available on the system. This mode can be
further customized via the following options:
- * multimailhook.smtpServer
-
- The name of the SMTP server to connect to. The value can
- also include a colon and a port number; e.g.,
- ``mail.example.com:25``. Default is 'localhost' using port 25.
-
- * multimailhook.smtpUser
- * multimailhook.smtpPass
-
- Server username and password. Required if smtpEncryption is 'ssl'.
- Note that the username and password currently need to be
- set cleartext in the configuration file, which is not
- recommended. If you need to use this option, be sure your
- configuration file is read-only.
+ multimailhook.smtpServer
+ The name of the SMTP server to connect to. The value can
+ also include a colon and a port number; e.g.,
+ ``mail.example.com:25``. Default is 'localhost' using port 25.
- * multimailhook.envelopeSender
+ multimailhook.smtpUser, multimailhook.smtpPass
+ Server username and password. Required if smtpEncryption is 'ssl'.
+ Note that the username and password currently need to be
+ set cleartext in the configuration file, which is not
+ recommended. If you need to use this option, be sure your
+ configuration file is read-only.
+ multimailhook.envelopeSender
The sender address to be passed to the SMTP server. If
unset, then the value of multimailhook.from is used.
- * multimailhook.smtpServerTimeout
-
+ multimailhook.smtpServerTimeout
Timeout in seconds.
- * multimailhook.smtpEncryption
-
- Set the security type. Allowed values: none, ssl, tls.
- Default=none.
-
- * multimailhook.smtpServerDebugLevel
-
+ multimailhook.smtpEncryption
+ Set the security type. Allowed values: ``none``, ``ssl``, ``tls`` (starttls).
+ Default is ``none``.
+
+ multimailhook.smtpCACerts
+ Set the path to a list of trusted CA certificate to verify the
+ server certificate, only supported when ``smtpEncryption`` is
+ ``tls``. If unset or empty, the server certificate is not
+ verified. If it targets a file containing a list of trusted CA
+ certificates (PEM format) these CAs will be used to verify the
+ server certificate. For debian, you can set
+ ``/etc/ssl/certs/ca-certificates.crt`` for using the system
+ trusted CAs. For self-signed server, you can add your server
+ certificate to the system store::
+
+ cd /usr/local/share/ca-certificates/
+ openssl s_client -starttls smtp \
+ -connect mail.example.net:587 -showcerts \
+ </dev/null 2>/dev/null \
+ | openssl x509 -outform PEM >mail.example.net.crt
+ update-ca-certificates
+
+ and used the updated ``/etc/ssl/certs/ca-certificates.crt``. Or
+ directly use your ``/path/to/mail.example.net.crt``. Default is
+ unset.
+
+ multimailhook.smtpServerDebugLevel
Integer number. Set to greater than 0 to activate debugging.
-multimailhook.from
-multimailhook.fromCommit
-multimailhook.fromRefchange
-
+multimailhook.from, multimailhook.fromCommit, multimailhook.fromRefchange
If set, use this value in the From: field of generated emails.
``fromCommit`` is used for commit emails, ``fromRefchange`` is
used for refchange emails, and ``from`` is used as fall-back in
@@ -372,7 +410,7 @@ multimailhook.fromRefchange
- The value ``pusher``, in which case the pusher's address (if
available) will be used.
- - The value ``author`` (meaningful only for replyToCommit), in which
+ - The value ``author`` (meaningful only for ``fromCommit``), in which
case the commit author's address will be used.
If config values are unset, the value of the From: header is
@@ -396,14 +434,12 @@ multimailhook.fromRefchange
3. Use the value of multimailhook.envelopeSender.
multimailhook.administrator
-
The name and/or email address of the administrator of the Git
repository; used in FOOTER_TEMPLATE. Default is
multimailhook.envelopesender if it is set; otherwise a generic
string is used.
multimailhook.emailPrefix
-
All emails have this string prepended to their subjects, to aid
email filtering (though filtering based on the X-Git-* email
headers is probably more robust). Default is the short name of
@@ -411,16 +447,14 @@ multimailhook.emailPrefix
value to the empty string to suppress the email prefix.
multimailhook.emailMaxLines
-
The maximum number of lines that should be included in the body of
a generated email. If not specified, there is no limit. Lines
beyond the limit are suppressed and counted, and a final line is
added indicating the number of suppressed lines.
multimailhook.emailMaxLineLength
-
The maximum length of a line in the email body. Lines longer than
- this limit are truncated to this length with a trailing `` [...]``
+ this limit are truncated to this length with a trailing ``[...]``
added to indicate the missing text. The default is 500, because
(a) diffs with longer lines are probably from binary files, for
which a diff is useless, and (b) even if a text file has such long
@@ -428,7 +462,6 @@ multimailhook.emailMaxLineLength
truncation, set this option to 0.
multimailhook.maxCommitEmails
-
The maximum number of commit emails to send for a given change.
When the number of patches is larger that this value, only the
summary refchange email is sent. This can avoid accidental
@@ -436,14 +469,12 @@ multimailhook.maxCommitEmails
emails limit, set this option to 0. The default is 500.
multimailhook.emailStrictUTF8
-
If this boolean option is set to `true`, then the main part of the
email body is forced to be valid UTF-8. Any characters that are
not valid UTF-8 are converted to the Unicode replacement
character, U+FFFD. The default is `true`.
multimailhook.diffOpts
-
Options passed to ``git diff-tree`` when generating the summary
information for ReferenceChange emails. Default is ``--stat
--summary --find-copies-harder``. Add -p to those options to
@@ -452,7 +483,6 @@ multimailhook.diffOpts
details.
multimailhook.graphOpts
-
Options passed to ``git log --graph`` when generating graphs for the
reference change summary emails (used only if refchangeShowGraph
is true). The default is '--oneline --decorate'.
@@ -460,7 +490,6 @@ multimailhook.graphOpts
Shell quoting is allowed; see logOpts for details.
multimailhook.logOpts
-
Options passed to ``git log`` to generate additional info for
reference change emails (used only if refchangeShowLog is set).
For example, adding -p will show each commit's complete diff. The
@@ -479,7 +508,6 @@ multimailhook.logOpts
logopts = --pretty=format:\"%h %aN <%aE>%n%s%n%n%b%n\"
multimailhook.commitLogOpts
-
Options passed to ``git log`` to generate additional info for
revision change emails. For example, adding --ignore-all-spaces
will suppress whitespace changes. The default options are ``-C
@@ -487,26 +515,21 @@ multimailhook.commitLogOpts
multimailhook.logOpts for details.
multimailhook.dateSubstitute
-
String to use as a substitute for ``Date:`` in the output of ``git
log`` while formatting commit messages. This is usefull to avoid
emitting a line that can be interpreted by mailers as the start of
a cited message (Zimbra webmail in particular). Defaults to
- ``CommitDate: ``. Set to an empty string or ``none`` to deactivate
+ ``CommitDate:``. Set to an empty string or ``none`` to deactivate
the behavior.
multimailhook.emailDomain
-
Domain name appended to the username of the person doing the push
to convert it into an email address
(via ``"%s@%s" % (username, emaildomain)``). More complicated
schemes can be implemented by overriding Environment and
overriding its get_pusher_email() method.
-multimailhook.replyTo
-multimailhook.replyToCommit
-multimailhook.replyToRefchange
-
+multimailhook.replyTo, multimailhook.replyToCommit, multimailhook.replyToRefchange
Addresses to use in the Reply-To: field for commit emails
(replyToCommit) and refchange emails (replyToRefchange).
multimailhook.replyTo is used as default when replyToCommit or
@@ -519,32 +542,24 @@ multimailhook.replyToRefchange
commit emails.
multimailhook.quiet
-
Do not output the list of email recipients from the hook
multimailhook.stdout
-
For debugging, send emails to stdout rather than to the
mailer. Equivalent to the --stdout command line option
multimailhook.scanCommitForCc
-
If this option is set to true, than recipients from lines in commit body
that starts with ``CC:`` will be added to CC list.
Default: false
multimailhook.combineWhenSingleCommit
-
If this option is set to true and a single new commit is pushed to
a branch, combine the summary and commit email messages into a
single email.
Default: true
-multimailhook.refFilterInclusionRegex
-multimailhook.refFilterExclusionRegex
-multimailhook.refFilterDoSendRegex
-multimailhook.refFilterDontSendRegex
-
+multimailhook.refFilterInclusionRegex, multimailhook.refFilterExclusionRegex, multimailhook.refFilterDoSendRegex, multimailhook.refFilterDontSendRegex
**Warning:** these options are experimental. They should work, but
the user-interface is not stable yet (in particular, the option
names may change). If you want to participate in stabilizing the
@@ -626,14 +641,16 @@ git-multimail is mostly customized via an "environment" that describes
the local environment in which Git is running. Two types of
environment are built in:
-* GenericEnvironment: a stand-alone Git repository.
+GenericEnvironment
+ a stand-alone Git repository.
-* GitoliteEnvironment: a Git repository that is managed by gitolite
- [3]_. For such repositories, the identity of the pusher is read from
- environment variable $GL_USER, the name of the repository is read
- from $GL_REPO (if it is not overridden by multimailhook.reponame),
- and the From: header value is optionally read from gitolite.conf
- (see multimailhook.from).
+GitoliteEnvironment
+ a Git repository that is managed by gitolite
+ [3]_. For such repositories, the identity of the pusher is read from
+ environment variable $GL_USER, the name of the repository is read
+ from $GL_REPO (if it is not overridden by multimailhook.reponame),
+ and the From: header value is optionally read from gitolite.conf
+ (see multimailhook.from).
By default, git-multimail assumes GitoliteEnvironment if $GL_USER and
$GL_REPO are set, and otherwise assumes GenericEnvironment.
diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index 300a2a4..1210bde 100644
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -6,10 +6,10 @@ website:
https://github.com/git-multimail/git-multimail
The version in this directory was obtained from the upstream project
-on October 11 2015 and consists of the "git-multimail" subdirectory from
+on May 13 2016 and consists of the "git-multimail" subdirectory from
revision
- c0791b9ef5821a746fc3475c25765e640452eaae refs/tags/1.2.0
+ 3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1
Please see the README file in this directory for information about how
to report bugs or contribute to git-multimail.
diff --git a/contrib/hooks/multimail/doc/customizing-emails.rst b/contrib/hooks/multimail/doc/customizing-emails.rst
new file mode 100644
index 0000000..3f5b67f
--- /dev/null
+++ b/contrib/hooks/multimail/doc/customizing-emails.rst
@@ -0,0 +1,56 @@
+Customizing the content and formatting of emails
+================================================
+
+Overloading template strings
+----------------------------
+
+The content of emails is generated based on template strings defined
+in ``git_multimail.py``. You can customize these template strings
+without changing the script itself, by defining a Python wrapper
+around it. The python wrapper should ``import git_multimail`` and then
+override the ``git_multimail.*`` strings like this::
+
+ import sys # needed for sys.argv
+
+ # Import and customize git_multimail:
+ import git_multimail
+ git_multimail.REVISION_INTRO_TEMPLATE = """..."""
+ git_multimail.COMBINED_INTRO_TEMPLATE = git_multimail.REVISION_INTRO_TEMPLATE
+
+ # start git_multimail itself:
+ git_multimail.main(sys.argv[1:])
+
+The template strings can use any value already used in the existing
+templates (read the source code).
+
+Using HTML in template strings
+------------------------------
+
+If ``multimailhook.commitEmailFormat`` is set to HTML, then
+git-multimail will generate HTML emails for commit notifications. The
+log and diff will be formatted automatically by git-multimail. By
+default, any HTML special character in the templates will be escaped.
+
+To use HTML formatting in the introduction of the email, set
+``multimailhook.htmlInIntro`` to ``true``. Then, the template can
+contain any HTML tags, that will be sent as-is in the email. For
+example, to add some formatting and a link to the online commit, use
+a format like::
+
+ git_multimail.REVISION_INTRO_TEMPLATE = """\
+ <span style="color:#808080">This is an automated email from the git hooks/post-receive script.</span><br /><br />
+
+ <strong>%(pusher)s</strong> pushed a commit to %(refname_type)s %(short_refname)s
+ in repository %(repo_shortname)s.<br />
+
+ <a href="https://github.com/git-multimail/git-multimail/commit/%(newrev)s">View on GitHub</a>.
+ """
+
+Note that the values expanded from ``%(variable)s`` in the format
+strings will still be escaped.
+
+For a less flexible but easier to set up way to add a link to commit
+emails, see ``multimailhook.commitBrowseURL``.
+
+Similarly, one can set ``multimailhook.htmlInFooter`` and override any
+of the ``*_FOOTER*`` template strings.
diff --git a/contrib/hooks/multimail/doc/troubleshooting.rst b/contrib/hooks/multimail/doc/troubleshooting.rst
new file mode 100644
index 0000000..d3f346f
--- /dev/null
+++ b/contrib/hooks/multimail/doc/troubleshooting.rst
@@ -0,0 +1,44 @@
+Troubleshooting issues with git-multimail: a FAQ
+================================================
+
+Git is not using the right address in the From/To/Reply-To field
+----------------------------------------------------------------
+
+First, make sure that git-multimail actually uses what you think it is
+using. A lot happens to your email (especially when posting to a
+mailing-list) between the time `git_multimail.py` sends it and the
+time it reaches your inbox.
+
+A simple test (to do on a test repository, do not use in production as
+it would disable email sending): change your post-receive hook to call
+`git_multimail.py` with the `--stdout` option, and try to push to the
+repository. You should see something like::
+
+ Counting objects: 3, done.
+ Writing objects: 100% (3/3), 263 bytes | 0 bytes/s, done.
+ Total 3 (delta 0), reused 0 (delta 0)
+ remote: Sending notification emails to: foo.bar@example.com
+ remote: ===========================================================================
+ remote: Date: Mon, 25 Apr 2016 18:39:59 +0200
+ remote: To: foo.bar@example.com
+ remote: Subject: [git] branch master updated: foo
+ remote: MIME-Version: 1.0
+ remote: Content-Type: text/plain; charset=utf-8
+ remote: Content-Transfer-Encoding: 8bit
+ remote: Message-ID: <20160425163959.2311.20498@anie>
+ remote: From: Auth Or <Foo.Bar@example.com>
+ remote: Reply-To: Auth Or <Foo.Bar@example.com>
+ remote: X-Git-Host: example
+ ...
+ remote: --
+ remote: To stop receiving notification emails like this one, please contact
+ remote: the administrator of this repository.
+ remote: ===========================================================================
+ To /path/to/repo
+ 6278f04..e173f20 master -> master
+
+Note: this does not include the sender (Return-Path: header), as it is
+not part of the message content but passed to the mailer. Some mailer
+show the ``Sender:`` field instead of the ``From:`` field (for
+example, Zimbra Webmail shows ``From: <sender-field> on behalf of
+<from-field>``).
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 0180dba..54ab4a4 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-__version__ = '1.2.0'
+__version__ = '1.3.1'
# Copyright (c) 2015 Matthieu Moy and others
# Copyright (c) 2012-2014 Michael Haggerty and others
@@ -57,6 +57,11 @@ import subprocess
import shlex
import optparse
import smtplib
+try:
+ import ssl
+except ImportError:
+ # Python < 2.6 do not have ssl, but that's OK if we don't use it.
+ pass
import time
import cgi
@@ -75,6 +80,9 @@ def is_ascii(s):
if PYTHON3:
+ def is_string(s):
+ return isinstance(s, str)
+
def str_to_bytes(s):
return s.encode(ENCODING)
@@ -91,6 +99,12 @@ if PYTHON3:
except UnicodeEncodeError:
f.buffer.write(msg.encode(ENCODING))
else:
+ def is_string(s):
+ try:
+ return isinstance(s, basestring)
+ except NameError: # Silence Pyflakes warning
+ raise
+
def str_to_bytes(s):
return s
@@ -313,6 +327,16 @@ in repository %(repo_shortname)s.
"""
+LINK_TEXT_TEMPLATE = """\
+View the commit online:
+%(browse_url)s
+
+"""
+
+LINK_HTML_TEMPLATE = """\
+<p><a href="%(browse_url)s">View the commit online</a>.</p>
+"""
+
REVISION_FOOTER_TEMPLATE = FOOTER_TEMPLATE
@@ -532,6 +556,28 @@ class Config(object):
assert words[-1] == ''
return words[:-1]
+ @staticmethod
+ def add_config_parameters(c):
+ """Add configuration parameters to Git.
+
+ c is either an str or a list of str, each element being of the
+ form 'var=val' or 'var', with the same syntax and meaning as
+ the argument of 'git -c var=val'.
+ """
+ if isinstance(c, str):
+ c = (c,)
+ parameters = os.environ.get('GIT_CONFIG_PARAMETERS', '')
+ if parameters:
+ parameters += ' '
+ # git expects GIT_CONFIG_PARAMETERS to be of the form
+ # "'name1=value1' 'name2=value2' 'name3=value3'"
+ # including everything inside the double quotes (but not the double
+ # quotes themselves). Spacing is critical. Also, if a value contains
+ # a literal single quote that quote must be represented using the
+ # four character sequence: '\''
+ parameters += ' '.join("'" + x.replace("'", "'\\''") + "'" for x in c)
+ os.environ['GIT_CONFIG_PARAMETERS'] = parameters
+
def get(self, name, default=None):
try:
values = self._split(read_git_output(
@@ -745,6 +791,12 @@ class Change(object):
values['multimail_version'] = get_version()
return values
+ # Aliases usable in template strings. Tuple of pairs (destination,
+ # source).
+ VALUES_ALIAS = (
+ ("id", "newrev"),
+ )
+
def get_values(self, **extra_values):
"""Return a dictionary {keyword: expansion} for this Change.
@@ -760,6 +812,9 @@ class Change(object):
values = self._values.copy()
if extra_values:
values.update(extra_values)
+
+ for alias, val in self.VALUES_ALIAS:
+ values[alias] = values[val]
return values
def expand(self, template, **extra_values):
@@ -772,10 +827,14 @@ class Change(object):
return template % self.get_values(**extra_values)
- def expand_lines(self, template, **extra_values):
+ def expand_lines(self, template, html_escape_val=False, **extra_values):
"""Break template into lines and expand each line."""
values = self.get_values(**extra_values)
+ if html_escape_val:
+ for k in values:
+ if is_string(values[k]):
+ values[k] = cgi.escape(values[k], True)
for line in template.splitlines(True):
yield line % values
@@ -787,9 +846,10 @@ class Change(object):
values = self.get_values(**extra_values)
if self._contains_html_diff:
- values['contenttype'] = 'html'
+ self._content_type = 'html'
else:
- values['contenttype'] = 'plain'
+ self._content_type = 'plain'
+ values['contenttype'] = self._content_type
for line in template.splitlines():
(name, value) = line.split(': ', 1)
@@ -819,7 +879,11 @@ class Change(object):
raise NotImplementedError()
- def generate_email_intro(self):
+ def generate_browse_link(self, base_url):
+ """Generate a link to an online repository browser."""
+ return iter(())
+
+ def generate_email_intro(self, html_escape_val=False):
"""Generate the email intro for this Change, a line at a time.
The output will be used as the standard boilerplate at the top
@@ -835,7 +899,7 @@ class Change(object):
raise NotImplementedError()
- def generate_email_footer(self):
+ def generate_email_footer(self, html_escape_val):
"""Generate the footer of the email, a line at a time.
The footer is always included, irrespective of
@@ -876,9 +940,18 @@ class Change(object):
for line in self.generate_email_header(**extra_header_values):
yield line
yield '\n'
- for line in self._wrap_for_html(self.generate_email_intro()):
+ html_escape_val = (self.environment.html_in_intro and
+ self._contains_html_diff)
+ intro = self.generate_email_intro(html_escape_val)
+ if not self.environment.html_in_intro:
+ intro = self._wrap_for_html(intro)
+ for line in intro:
yield line
+ if self.environment.commitBrowseURL:
+ for line in self.generate_browse_link(self.environment.commitBrowseURL):
+ yield line
+
body = self.generate_email_body(push)
if body_filter is not None:
body = body_filter(body)
@@ -939,8 +1012,12 @@ class Change(object):
yield line
if self._contains_html_diff:
yield '</pre>'
-
- for line in self._wrap_for_html(self.generate_email_footer()):
+ html_escape_val = (self.environment.html_in_footer and
+ self._contains_html_diff)
+ footer = self.generate_email_footer(html_escape_val)
+ if not self.environment.html_in_footer:
+ footer = self._wrap_for_html(footer)
+ for line in footer:
yield line
def get_alt_fromaddr(self):
@@ -992,6 +1069,7 @@ class Revision(Change):
values['rev_short'] = self.rev.short
values['change_type'] = self.change_type
values['refname'] = self.refname
+ values['newrev'] = self.rev.sha1
values['short_refname'] = self.reference_change.short_refname
values['refname_type'] = self.reference_change.refname_type
values['reply_to_msgid'] = self.reference_change.msgid
@@ -1015,8 +1093,26 @@ class Revision(Change):
):
yield line
- def generate_email_intro(self):
- for line in self.expand_lines(REVISION_INTRO_TEMPLATE):
+ def generate_browse_link(self, base_url):
+ if '%(' not in base_url:
+ base_url += '%(id)s'
+ url = "".join(self.expand_lines(base_url))
+ if self._content_type == 'html':
+ for line in self.expand_lines(LINK_HTML_TEMPLATE,
+ html_escape_val=True,
+ browse_url=url):
+ yield line
+ elif self._content_type == 'plain':
+ for line in self.expand_lines(LINK_TEXT_TEMPLATE,
+ html_escape_val=False,
+ browse_url=url):
+ yield line
+ else:
+ raise NotImplementedError("Content-type %s unsupported. Please report it as a bug.")
+
+ def generate_email_intro(self, html_escape_val=False):
+ for line in self.expand_lines(REVISION_INTRO_TEMPLATE,
+ html_escape_val=html_escape_val):
yield line
def generate_email_body(self, push):
@@ -1031,8 +1127,9 @@ class Revision(Change):
else:
yield line
- def generate_email_footer(self):
- return self.expand_lines(REVISION_FOOTER_TEMPLATE)
+ def generate_email_footer(self, html_escape_val):
+ return self.expand_lines(REVISION_FOOTER_TEMPLATE,
+ html_escape_val=html_escape_val)
def generate_email(self, push, body_filter=None, extra_header_values={}):
self._contains_diff()
@@ -1217,8 +1314,9 @@ class ReferenceChange(Change):
):
yield line
- def generate_email_intro(self):
- for line in self.expand_lines(self.intro_template):
+ def generate_email_intro(self, html_escape_val=False):
+ for line in self.expand_lines(self.intro_template,
+ html_escape_val=html_escape_val):
yield line
def generate_email_body(self, push):
@@ -1238,8 +1336,9 @@ class ReferenceChange(Change):
for line in self.generate_revision_change_summary(push):
yield line
- def generate_email_footer(self):
- return self.expand_lines(self.footer_template)
+ def generate_email_footer(self, html_escape_val):
+ return self.expand_lines(self.footer_template,
+ html_escape_val=html_escape_val)
def generate_revision_change_graph(self, push):
if self.showgraph:
@@ -1605,6 +1704,14 @@ class BranchChange(ReferenceChange):
self.header_template = COMBINED_HEADER_TEMPLATE
self.intro_template = COMBINED_INTRO_TEMPLATE
self.footer_template = COMBINED_FOOTER_TEMPLATE
+
+ def revision_gen_link(base_url):
+ # revision is used only to generate the body, and
+ # _content_type is set while generating headers. Get it
+ # from the BranchChange object.
+ revision._content_type = self._content_type
+ return revision.generate_browse_link(base_url)
+ self.generate_browse_link = revision_gen_link
for line in self.generate_email(push, body_filter, values):
yield line
@@ -1896,6 +2003,7 @@ class SMTPMailer(Mailer):
smtpservertimeout=10.0, smtpserverdebuglevel=0,
smtpencryption='none',
smtpuser='', smtppass='',
+ smtpcacerts=''
):
if not envelopesender:
sys.stderr.write(
@@ -1915,6 +2023,7 @@ class SMTPMailer(Mailer):
self.security = smtpencryption
self.username = smtpuser
self.password = smtppass
+ self.smtpcacerts = smtpcacerts
try:
def call(klass, server, timeout):
try:
@@ -1925,13 +2034,56 @@ class SMTPMailer(Mailer):
if self.security == 'none':
self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)
elif self.security == 'ssl':
+ if self.smtpcacerts:
+ raise smtplib.SMTPException(
+ "Checking certificate is not supported for ssl, prefer starttls"
+ )
self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)
elif self.security == 'tls':
+ if 'ssl' not in sys.modules:
+ sys.stderr.write(
+ '*** Your Python version does not have the ssl library installed\n'
+ '*** smtpEncryption=tls is not available.\n'
+ '*** Either upgrade Python to 2.6 or later\n'
+ ' or use git_multimail.py version 1.2.\n')
if ':' not in self.smtpserver:
self.smtpserver += ':587' # default port for TLS
self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)
+ # start: ehlo + starttls
+ # equivalent to
+ # self.smtp.ehlo()
+ # self.smtp.starttls()
+ # with acces to the ssl layer
self.smtp.ehlo()
- self.smtp.starttls()
+ if not self.smtp.has_extn("starttls"):
+ raise smtplib.SMTPException("STARTTLS extension not supported by server")
+ resp, reply = self.smtp.docmd("STARTTLS")
+ if resp != 220:
+ raise smtplib.SMTPException("Wrong answer to the STARTTLS command")
+ if self.smtpcacerts:
+ self.smtp.sock = ssl.wrap_socket(
+ self.smtp.sock,
+ ca_certs=self.smtpcacerts,
+ cert_reqs=ssl.CERT_REQUIRED
+ )
+ else:
+ self.smtp.sock = ssl.wrap_socket(
+ self.smtp.sock,
+ cert_reqs=ssl.CERT_NONE
+ )
+ sys.stderr.write(
+ '*** Warning, the server certificat is not verified (smtp) ***\n'
+ '*** set the option smtpCACerts ***\n'
+ )
+ if not hasattr(self.smtp.sock, "read"):
+ # using httplib.FakeSocket with Python 2.5.x or earlier
+ self.smtp.sock.read = self.smtp.sock.recv
+ self.smtp.file = smtplib.SSLFakeFile(self.smtp.sock)
+ self.smtp.helo_resp = None
+ self.smtp.ehlo_resp = None
+ self.smtp.esmtp_features = {}
+ self.smtp.does_esmtp = 0
+ # end: ehlo + starttls
self.smtp.ehlo()
else:
sys.stdout.write('*** Error: Control reached an invalid option. ***')
@@ -1951,6 +2103,7 @@ class SMTPMailer(Mailer):
def __del__(self):
if hasattr(self, 'smtp'):
self.smtp.quit()
+ del self.smtp
def send(self, lines, to_addrs):
try:
@@ -1958,13 +2111,24 @@ class SMTPMailer(Mailer):
self.smtp.login(self.username, self.password)
msg = ''.join(lines)
# turn comma-separated list into Python list if needed.
- if isinstance(to_addrs, basestring):
+ if is_string(to_addrs):
to_addrs = [email for (name, email) in getaddresses([to_addrs])]
self.smtp.sendmail(self.envelopesender, to_addrs, msg)
- except Exception:
+ except smtplib.SMTPResponseException:
sys.stderr.write('*** Error sending email ***\n')
- sys.stderr.write('*** %s\n' % sys.exc_info()[1])
- self.smtp.quit()
+ err = sys.exc_info()[1]
+ sys.stderr.write('*** Error %d: %s\n' % (err.smtp_code,
+ bytes_to_str(err.smtp_error)))
+ try:
+ smtp = self.smtp
+ # delete the field before quit() so that in case of
+ # error, self.smtp is deleted anyway.
+ del self.smtp
+ smtp.quit()
+ except:
+ sys.stderr.write('*** Error closing the SMTP connection ***\n')
+ sys.stderr.write('*** Exiting anyway ... ***\n')
+ sys.stderr.write('*** %s\n' % sys.exc_info()[1])
sys.exit(1)
@@ -2097,6 +2261,14 @@ class Environment(object):
If "html", generate commit emails in HTML instead of plain text
used by default.
+ html_in_intro (bool)
+ html_in_footer (bool)
+
+ When generating HTML emails, the introduction (respectively,
+ the footer) will be HTML-escaped iff html_in_intro (respectively,
+ the footer) is true. When false, only the values used to expand
+ the template are escaped.
+
refchange_showgraph (bool)
True iff refchanges emails should include a detailed graph.
@@ -2160,6 +2332,9 @@ class Environment(object):
self.osenv = osenv or os.environ
self.announce_show_shortlog = False
self.commit_email_format = "text"
+ self.html_in_intro = False
+ self.html_in_footer = False
+ self.commitBrowseURL = None
self.maxcommitemails = 500
self.diffopts = ['--stat', '--summary', '--find-copies-harder']
self.graphopts = ['--oneline', '--decorate']
@@ -2236,7 +2411,7 @@ class Environment(object):
The return value is always a new dictionary."""
if self._values is None:
- values = {}
+ values = {'': ''} # %()s expands to the empty string.
for key in self.COMPUTED_KEYS:
value = getattr(self, 'get_%s' % (key,))()
@@ -2375,6 +2550,16 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
else:
self.commit_email_format = commit_email_format
+ html_in_intro = config.get_bool('htmlInIntro')
+ if html_in_intro is not None:
+ self.html_in_intro = html_in_intro
+
+ html_in_footer = config.get_bool('htmlInFooter')
+ if html_in_footer is not None:
+ self.html_in_footer = html_in_footer
+
+ self.commitBrowseURL = config.get('commitBrowseURL')
+
maxcommitemails = config.get('maxcommitemails')
if maxcommitemails is not None:
try:
@@ -2415,7 +2600,6 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
['author'])
self.__reply_to_commit = config.get('replyToCommit', default=reply_to)
- from_addr = self.config.get('from')
self.from_refchange = config.get('fromRefchange')
self.forbid_field_values('fromRefchange',
self.from_refchange,
@@ -3390,6 +3574,8 @@ def run_as_post_receive_hook(environment, mailer):
if changes:
push = Push(environment, changes)
push.send_emails(mailer, body_filter=environment.filter_body)
+ if hasattr(mailer, '__del__'):
+ mailer.__del__()
def run_as_update_hook(environment, mailer, refname, oldrev, newrev, force_send=False):
@@ -3406,6 +3592,8 @@ def run_as_update_hook(environment, mailer, refname, oldrev, newrev, force_send=
]
push = Push(environment, changes, force_send)
push.send_emails(mailer, body_filter=environment.filter_body)
+ if hasattr(mailer, '__del__'):
+ mailer.__del__()
def choose_mailer(config, environment):
@@ -3418,6 +3606,7 @@ def choose_mailer(config, environment):
smtpencryption = config.get('smtpencryption', default='none')
smtpuser = config.get('smtpuser', default='')
smtppass = config.get('smtppass', default='')
+ smtpcacerts = config.get('smtpcacerts', default='')
mailer = SMTPMailer(
envelopesender=(environment.get_sender() or environment.get_fromaddr()),
smtpserver=smtpserver, smtpservertimeout=smtpservertimeout,
@@ -3425,6 +3614,7 @@ def choose_mailer(config, environment):
smtpencryption=smtpencryption,
smtpuser=smtpuser,
smtppass=smtppass,
+ smtpcacerts=smtpcacerts
)
elif mailer == 'sendmail':
command = config.get('sendmailcommand')
@@ -3691,17 +3881,7 @@ def main(args):
return
if options.c:
- parameters = os.environ.get('GIT_CONFIG_PARAMETERS', '')
- if parameters:
- parameters += ' '
- # git expects GIT_CONFIG_PARAMETERS to be of the form
- # "'name1=value1' 'name2=value2' 'name3=value3'"
- # including everything inside the double quotes (but not the double
- # quotes themselves). Spacing is critical. Also, if a value contains
- # a literal single quote that quote must be represented using the
- # four character sequence: '\''
- parameters += ' '.join("'" + x.replace("'", "'\\''") + "'" for x in options.c)
- os.environ['GIT_CONFIG_PARAMETERS'] = parameters
+ Config.add_config_parameters(options.c)
config = Config('multimailhook')
diff --git a/contrib/hooks/multimail/post-receive.example b/contrib/hooks/multimail/post-receive.example
index 9975df7..1ea113d 100755
--- a/contrib/hooks/multimail/post-receive.example
+++ b/contrib/hooks/multimail/post-receive.example
@@ -55,6 +55,12 @@ import git_multimail
# git-multimail:
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
+# environment) :
+#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
+#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))
# Select the type of environment:
try:
diff --git a/convert.c b/convert.c
index f524b8d..b1614bf 100644
--- a/convert.c
+++ b/convert.c
@@ -1380,27 +1380,22 @@ static struct stream_filter *ident_filter(const unsigned char *sha1)
struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1)
{
struct conv_attrs ca;
- enum crlf_action crlf_action;
struct stream_filter *filter = NULL;
convert_attrs(&ca, path);
-
if (ca.drv && (ca.drv->smudge || ca.drv->clean))
- return filter;
+ return NULL;
+
+ if (ca.crlf_action == CRLF_AUTO || ca.crlf_action == CRLF_AUTO_CRLF)
+ return NULL;
if (ca.ident)
filter = ident_filter(sha1);
- crlf_action = ca.crlf_action;
-
- if ((crlf_action == CRLF_BINARY) ||
- crlf_action == CRLF_AUTO_INPUT ||
- (crlf_action == CRLF_TEXT_INPUT))
- filter = cascade_filter(filter, &null_filter_singleton);
-
- else if (output_eol(crlf_action) == EOL_CRLF &&
- !(crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_CRLF))
+ if (output_eol(ca.crlf_action) == EOL_CRLF)
filter = cascade_filter(filter, lf_to_crlf_filter());
+ else
+ filter = cascade_filter(filter, &null_filter_singleton);
return filter;
}
diff --git a/copy.c b/copy.c
index 574fa1f..4de6a11 100644
--- a/copy.c
+++ b/copy.c
@@ -42,15 +42,15 @@ int copy_file(const char *dst, const char *src, int mode)
status = copy_fd(fdi, fdo);
switch (status) {
case COPY_READ_ERROR:
- error("copy-fd: read returned %s", strerror(errno));
+ error_errno("copy-fd: read returned");
break;
case COPY_WRITE_ERROR:
- error("copy-fd: write returned %s", strerror(errno));
+ error_errno("copy-fd: write returned");
break;
}
close(fdi);
if (close(fdo) != 0)
- return error("%s: close error: %s", dst, strerror(errno));
+ return error_errno("%s: close error", dst);
if (!status && adjust_shared_perm(dst))
return -1;
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index caef21e..1f14d56 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -126,8 +126,17 @@ static void serve_one_client(FILE *in, FILE *out)
fprintf(out, "password=%s\n", e->item.password);
}
}
- else if (!strcmp(action.buf, "exit"))
+ else if (!strcmp(action.buf, "exit")) {
+ /*
+ * It's important that we clean up our socket first, and then
+ * signal the client only once we have finished the cleanup.
+ * Calling exit() directly does this, because we clean up in
+ * our atexit() handler, and then signal the client when our
+ * process actually ends, which closes the socket and gives
+ * them EOF.
+ */
exit(0);
+ }
else if (!strcmp(action.buf, "erase"))
remove_credential(&c);
else if (!strcmp(action.buf, "store")) {
@@ -170,12 +179,12 @@ static int serve_cache_loop(int fd)
client = accept(fd, NULL, NULL);
if (client < 0) {
- warning("accept failed: %s", strerror(errno));
+ warning_errno("accept failed");
return 1;
}
client2 = dup(client);
if (client2 < 0) {
- warning("dup failed: %s", strerror(errno));
+ warning_errno("dup failed");
close(client);
return 1;
}
diff --git a/credential-cache.c b/credential-cache.c
index f4afdc6..86e21de 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -32,6 +32,7 @@ static int send_request(const char *socket, const struct strbuf *out)
write_or_die(1, in, r);
got_data = 1;
}
+ close(fd);
return got_data;
}
diff --git a/credential.c b/credential.c
index 7d6501d..aa99666 100644
--- a/credential.c
+++ b/credential.c
@@ -63,9 +63,12 @@ static int credential_config_callback(const char *var, const char *value,
key = dot + 1;
}
- if (!strcmp(key, "helper"))
- string_list_append(&c->helpers, value);
- else if (!strcmp(key, "username")) {
+ 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)
c->username = xstrdup(value);
}
diff --git a/diff-no-index.c b/diff-no-index.c
index 03daadb..1f8999b 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -65,8 +65,7 @@ static int populate_from_stdin(struct diff_filespec *s)
size_t size = 0;
if (strbuf_read(&buf, 0, 0) < 0)
- return error("error while reading from stdin %s",
- strerror(errno));
+ return error_errno("error while reading from stdin");
s->should_munmap = 0;
s->data = strbuf_detach(&buf, &size);
diff --git a/diff.c b/diff.c
index 059123c..fa78fc1 100644
--- a/diff.c
+++ b/diff.c
@@ -26,6 +26,7 @@
#endif
static int diff_detect_rename_default;
+static int diff_compaction_heuristic; /* experimental */
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
static int diff_use_color_default = -1;
@@ -168,6 +169,11 @@ long parse_algorithm_value(const char *value)
* never be affected by the setting of diff.renames
* the user happens to have in the configuration file.
*/
+void init_diff_ui_defaults(void)
+{
+ diff_detect_rename_default = 1;
+}
+
int git_diff_ui_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
@@ -184,6 +190,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
diff_detect_rename_default = git_config_rename(var, value);
return 0;
}
+ if (!strcmp(var, "diff.compactionheuristic")) {
+ diff_compaction_heuristic = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "diff.autorefreshindex")) {
diff_auto_refresh_index = git_config_bool(var, value);
return 0;
@@ -3273,6 +3283,8 @@ void diff_setup(struct diff_options *options)
options->use_color = diff_use_color_default;
options->detect_rename = diff_detect_rename_default;
options->xdl_opts |= diff_algorithm;
+ if (diff_compaction_heuristic)
+ DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
options->orderfile = diff_order_file_cfg;
@@ -3793,6 +3805,10 @@ int diff_opt_parse(struct diff_options *options,
DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
else if (!strcmp(arg, "--ignore-blank-lines"))
DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
+ else if (!strcmp(arg, "--compaction-heuristic"))
+ DIFF_XDL_SET(options, COMPACTION_HEURISTIC);
+ else if (!strcmp(arg, "--no-compaction-heuristic"))
+ DIFF_XDL_CLR(options, COMPACTION_HEURISTIC);
else if (!strcmp(arg, "--patience"))
options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
else if (!strcmp(arg, "--histogram"))
diff --git a/diff.h b/diff.h
index e7d68ed..125447b 100644
--- a/diff.h
+++ b/diff.h
@@ -266,6 +266,7 @@ extern int parse_long_opt(const char *opt, const char **argv,
const char **optarg);
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
+extern void init_diff_ui_defaults(void);
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int, const char *);
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 3b3c1ed..7f03eb5 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -340,9 +340,11 @@ static int find_exact_renames(struct diff_options *options)
int i, renames = 0;
struct hashmap file_table;
- /* Add all sources to the hash table */
+ /* Add all sources to the hash table in reverse order, because
+ * later on they will be retrieved in LIFO order.
+ */
hashmap_init(&file_table, NULL, rename_src_nr);
- for (i = 0; i < rename_src_nr; i++)
+ for (i = rename_src_nr-1; i >= 0; i--)
insert_file_table(&file_table, i, rename_src[i].p->one);
/* Walk the destinations and find best source match */
diff --git a/dir.c b/dir.c
index a4a9d9f..6172b34 100644
--- a/dir.c
+++ b/dir.c
@@ -53,24 +53,16 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
int check_only, const struct path_simplify *simplify);
static int get_dtype(struct dirent *de, const char *path, int len);
-/* helper string functions with support for the ignore_case flag */
-int strcmp_icase(const char *a, const char *b)
+int fspathcmp(const char *a, const char *b)
{
return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
}
-int strncmp_icase(const char *a, const char *b, size_t count)
+int fspathncmp(const char *a, const char *b, size_t count)
{
return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
}
-int fnmatch_icase(const char *pattern, const char *string, int flags)
-{
- return wildmatch(pattern, string,
- flags | (ignore_case ? WM_CASEFOLD : 0),
- NULL);
-}
-
int git_fnmatch(const struct pathspec_item *item,
const char *pattern, const char *string,
int prefix)
@@ -457,7 +449,7 @@ int no_wildcard(const char *string)
void parse_exclude_pattern(const char **pattern,
int *patternlen,
- int *flags,
+ unsigned *flags,
int *nowildcardlen)
{
const char *p = *pattern;
@@ -498,7 +490,7 @@ void add_exclude(const char *string, const char *base,
{
struct exclude *x;
int patternlen;
- int flags;
+ unsigned flags;
int nowildcardlen;
parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
@@ -798,16 +790,16 @@ void add_excludes_from_file(struct dir_struct *dir, const char *fname)
int match_basename(const char *basename, int basenamelen,
const char *pattern, int prefix, int patternlen,
- int flags)
+ unsigned flags)
{
if (prefix == patternlen) {
if (patternlen == basenamelen &&
- !strncmp_icase(pattern, basename, basenamelen))
+ !fspathncmp(pattern, basename, basenamelen))
return 1;
} else if (flags & EXC_FLAG_ENDSWITH) {
/* "*literal" matching against "fooliteral" */
if (patternlen - 1 <= basenamelen &&
- !strncmp_icase(pattern + 1,
+ !fspathncmp(pattern + 1,
basename + basenamelen - (patternlen - 1),
patternlen - 1))
return 1;
@@ -823,7 +815,7 @@ int match_basename(const char *basename, int basenamelen,
int match_pathname(const char *pathname, int pathlen,
const char *base, int baselen,
const char *pattern, int prefix, int patternlen,
- int flags)
+ unsigned flags)
{
const char *name;
int namelen;
@@ -844,7 +836,7 @@ int match_pathname(const char *pathname, int pathlen,
*/
if (pathlen < baselen + 1 ||
(baselen && pathname[baselen] != '/') ||
- strncmp_icase(pathname, base, baselen))
+ fspathncmp(pathname, base, baselen))
return 0;
namelen = baselen ? pathlen - baselen - 1 : pathlen;
@@ -858,7 +850,7 @@ int match_pathname(const char *pathname, int pathlen,
if (prefix > namelen)
return 0;
- if (strncmp_icase(pattern, name, prefix))
+ if (fspathncmp(pattern, name, prefix))
return 0;
pattern += prefix;
patternlen -= prefix;
diff --git a/dir.h b/dir.h
index cd46f30..bfde698 100644
--- a/dir.h
+++ b/dir.h
@@ -27,7 +27,7 @@ struct exclude {
int nowildcardlen;
const char *base;
int baselen;
- int flags;
+ unsigned flags; /* EXC_FLAG_* */
/*
* Counting starts from 1 for line numbers in ignore files,
@@ -226,10 +226,10 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname,
* attr.c:path_matches()
*/
extern int match_basename(const char *, int,
- const char *, int, int, int);
+ const char *, int, int, unsigned);
extern int match_pathname(const char *, int,
const char *, int,
- const char *, int, int, int);
+ const char *, int, int, unsigned);
extern struct exclude *last_exclude_matching(struct dir_struct *dir,
const char *name, int *dtype);
@@ -241,7 +241,7 @@ extern struct exclude_list *add_exclude_list(struct dir_struct *dir,
extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
struct exclude_list *el, int check_index);
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
-extern void parse_exclude_pattern(const char **string, int *patternlen, int *flags, int *nowildcardlen);
+extern void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
extern void add_exclude(const char *string, const char *base,
int baselen, struct exclude_list *el, int srcpos);
extern void clear_exclude_list(struct exclude_list *el);
@@ -270,9 +270,8 @@ extern int remove_dir_recursively(struct strbuf *path, int flag);
/* tries to remove the path with empty directories along it, ignores ENOENT */
extern int remove_path(const char *path);
-extern int strcmp_icase(const char *a, const char *b);
-extern int strncmp_icase(const char *a, const char *b, size_t count);
-extern int fnmatch_icase(const char *pattern, const char *string, int flags);
+extern int fspathcmp(const char *a, const char *b);
+extern int fspathncmp(const char *a, const char *b, size_t count);
/*
* The prefix part of pattern must not contains wildcards.
diff --git a/editor.c b/editor.c
index 01c644c..7519ede 100644
--- a/editor.c
+++ b/editor.c
@@ -63,7 +63,6 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
if (!buffer)
return 0;
if (strbuf_read_file(buffer, path, 0) < 0)
- return error("could not read file '%s': %s",
- path, strerror(errno));
+ return error_errno("could not read file '%s'", path);
return 0;
}
diff --git a/entry.c b/entry.c
index a410957..519e042 100644
--- a/entry.c
+++ b/entry.c
@@ -168,8 +168,8 @@ static int write_entry(struct cache_entry *ce,
ret = symlink(new, path);
free(new);
if (ret)
- return error("unable to create symlink %s (%s)",
- path, strerror(errno));
+ return error_errno("unable to create symlink %s",
+ path);
break;
}
@@ -186,8 +186,7 @@ static int write_entry(struct cache_entry *ce,
fd = open_output_fd(path, ce, to_tempfile);
if (fd < 0) {
free(new);
- return error("unable to create file %s (%s)",
- path, strerror(errno));
+ return error_errno("unable to create file %s", path);
}
wrote = write_in_full(fd, new, size);
@@ -284,8 +283,7 @@ int checkout_entry(struct cache_entry *ce,
return error("%s is a directory", path.buf);
remove_subtree(&path);
} else if (unlink(path.buf))
- return error("unable to unlink old '%s' (%s)",
- path.buf, strerror(errno));
+ return error_errno("unable to unlink old '%s'", path.buf);
} else if (state->not_new)
return 0;
diff --git a/environment.c b/environment.c
index 6dec9d0..ca72464 100644
--- a/environment.c
+++ b/environment.c
@@ -25,14 +25,13 @@ int log_all_ref_updates = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int warn_on_object_refname_ambiguity = 1;
int ref_paranoia = -1;
-int repository_format_version;
int repository_format_precious_objects;
const char *git_commit_encoding;
const char *git_log_output_encoding;
-int shared_repository = PERM_UMASK;
const char *apply_default_whitespace;
const char *apply_default_ignorewhitespace;
const char *git_attributes_file;
+const char *git_hooks_path;
int zlib_compression_level = Z_BEST_SPEED;
int core_compression_level;
int core_compression_seen;
@@ -64,8 +63,8 @@ int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
-struct startup_info *startup_info;
unsigned long pack_size_limit_cfg;
+enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
#ifndef PROTECT_HFS_DEFAULT
#define PROTECT_HFS_DEFAULT 0
@@ -325,3 +324,24 @@ const char *get_commit_output_encoding(void)
{
return git_commit_encoding ? git_commit_encoding : "UTF-8";
}
+
+static int the_shared_repository = PERM_UMASK;
+static int need_shared_repository_from_config = 1;
+
+void set_shared_repository(int value)
+{
+ the_shared_repository = value;
+ need_shared_repository_from_config = 0;
+}
+
+int get_shared_repository(void)
+{
+ if (need_shared_repository_from_config) {
+ const char *var = "core.sharedrepository";
+ const char *value;
+ if (!git_config_get_value(var, &value))
+ the_shared_repository = git_config_perm(var, value);
+ need_shared_repository_from_config = 0;
+ }
+ return the_shared_repository;
+}
diff --git a/fast-import.c b/fast-import.c
index 9fc7093..c504ef7 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -329,6 +329,7 @@ static const char *export_marks_file;
static const char *import_marks_file;
static int import_marks_file_from_stream;
static int import_marks_file_ignore_missing;
+static int import_marks_file_done;
static int relative_marks_paths;
/* Our last blob */
@@ -414,7 +415,7 @@ static void write_crash_report(const char *err)
struct recent_command *rc;
if (!rpt) {
- error("can't write crash report %s: %s", loc, strerror(errno));
+ error_errno("can't write crash report %s", loc);
free(loc);
return;
}
@@ -1512,7 +1513,7 @@ static int tree_content_set(
t = root->tree;
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
if (!*slash1) {
if (!S_ISDIR(mode)
&& e->versions[1].mode == mode
@@ -1602,7 +1603,7 @@ static int tree_content_remove(
t = root->tree;
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
if (*slash1 && !S_ISDIR(e->versions[1].mode))
/*
* If p names a file in some subdirectory, and a
@@ -1669,7 +1670,7 @@ static int tree_content_get(
t = root->tree;
for (i = 0; i < t->entry_count; i++) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
+ if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
if (!*slash1)
goto found_entry;
if (!S_ISDIR(e->versions[1].mode))
@@ -1802,12 +1803,12 @@ static void dump_marks(void)
static struct lock_file mark_lock;
FILE *f;
- if (!export_marks_file)
+ if (!export_marks_file || (import_marks_file && !import_marks_file_done))
return;
if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
- failure |= error("Unable to write marks file %s: %s",
- export_marks_file, strerror(errno));
+ failure |= error_errno("Unable to write marks file %s",
+ export_marks_file);
return;
}
@@ -1822,8 +1823,8 @@ static void dump_marks(void)
dump_marks_helper(f, 0, marks);
if (commit_lock_file(&mark_lock)) {
- failure |= error("Unable to write file %s: %s",
- export_marks_file, strerror(errno));
+ failure |= error_errno("Unable to write file %s",
+ export_marks_file);
return;
}
}
@@ -1835,7 +1836,7 @@ static void read_marks(void)
if (f)
;
else if (import_marks_file_ignore_missing && errno == ENOENT)
- return; /* Marks file does not exist */
+ goto done; /* Marks file does not exist */
else
die_errno("cannot read '%s'", import_marks_file);
while (fgets(line, sizeof(line), f)) {
@@ -1865,6 +1866,8 @@ static void read_marks(void)
insert_mark(mark, e);
}
fclose(f);
+done:
+ import_marks_file_done = 1;
}
diff --git a/fetch-pack.c b/fetch-pack.c
index f96f6df..b501d5c 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -15,7 +15,6 @@
#include "version.h"
#include "prio-queue.h"
#include "sha1-array.h"
-#include "sigchain.h"
static int transfer_unpack_limit = -1;
static int fetch_unpack_limit = -1;
@@ -674,10 +673,8 @@ static int sideband_demux(int in, int out, void *data)
int *xd = data;
int ret;
- sigchain_push(SIGPIPE, SIG_IGN);
ret = recv_sideband("fetch-pack", xd[0], out);
close(out);
- sigchain_pop(SIGPIPE);
return ret;
}
@@ -701,6 +698,7 @@ static int get_pack(struct fetch_pack_args *args,
demux.proc = sideband_demux;
demux.data = xd;
demux.out = -1;
+ demux.isolate_sigpipe = 1;
if (start_async(&demux))
die("fetch-pack: unable to fork off sideband"
" demultiplexer");
diff --git a/fsck.c b/fsck.c
index ca4c685..0531545 100644
--- a/fsck.c
+++ b/fsck.c
@@ -59,6 +59,7 @@
FUNC(HAS_DOTGIT, WARN) \
FUNC(NULL_SHA1, WARN) \
FUNC(ZERO_PADDED_FILEMODE, WARN) \
+ FUNC(NUL_IN_COMMIT, WARN) \
/* infos (reported as warnings, but ignored by default) */ \
FUNC(BAD_TAG_NAME, INFO) \
FUNC(MISSING_TAGGER_ENTRY, INFO)
@@ -312,9 +313,9 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
if (S_ISGITLINK(entry.mode))
continue;
if (S_ISDIR(entry.mode))
- result = options->walk(&lookup_tree(entry.sha1)->object, OBJ_TREE, data, options);
+ result = options->walk(&lookup_tree(entry.oid->hash)->object, OBJ_TREE, data, options);
else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
- result = options->walk(&lookup_blob(entry.sha1)->object, OBJ_BLOB, data, options);
+ result = options->walk(&lookup_blob(entry.oid->hash)->object, OBJ_BLOB, data, options);
else {
result = error("in tree %s: entry %s has bad mode %.6o",
oid_to_hex(&tree->object.oid), entry.path, entry.mode);
@@ -450,11 +451,11 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
while (desc.size) {
unsigned mode;
const char *name;
- const unsigned char *sha1;
+ const struct object_id *oid;
- sha1 = tree_entry_extract(&desc, &name, &mode);
+ oid = tree_entry_extract(&desc, &name, &mode);
- has_null_sha1 |= is_null_sha1(sha1);
+ has_null_sha1 |= is_null_oid(oid);
has_full_path |= !!strchr(name, '/');
has_empty_name |= !*name;
has_dot |= !strcmp(name, ".");
@@ -610,6 +611,7 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
struct commit_graft *graft;
unsigned parent_count, parent_line_count = 0, author_count;
int err;
+ const char *buffer_begin = buffer;
if (verify_headers(buffer, size, &commit->object, options))
return -1;
@@ -666,9 +668,17 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
err = fsck_ident(&buffer, &commit->object, options);
if (err)
return err;
- if (!commit->tree)
- return report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", sha1_to_hex(tree_sha1));
-
+ if (!commit->tree) {
+ err = report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", sha1_to_hex(tree_sha1));
+ if (err)
+ return err;
+ }
+ if (memchr(buffer_begin, '\0', size)) {
+ err = report(options, &commit->object, FSCK_MSG_NUL_IN_COMMIT,
+ "NUL byte in the commit object body");
+ if (err)
+ return err;
+ }
return 0;
}
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 77876d4..822f857 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -45,6 +45,7 @@ my ($diff_new_color) =
my $normal_color = $repo->get_color("", "reset");
my $diff_algorithm = $repo->config('diff.algorithm');
+my $diff_filter = $repo->config('interactive.difffilter');
my $use_readkey = 0;
my $use_termcap = 0;
@@ -754,7 +755,14 @@ sub parse_diff {
my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
my @colored = ();
if ($diff_use_color) {
- @colored = run_cmd_pipe("git", @diff_cmd, qw(--color --), $path);
+ my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
+ if (defined $diff_filter) {
+ # quotemeta is overkill, but sufficient for shell-quoting
+ my $diff = join(' ', map { quotemeta } @display_cmd);
+ @display_cmd = ("$diff | $diff_filter");
+ }
+
+ @colored = run_cmd_pipe(@display_cmd);
}
my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' };
@@ -765,7 +773,7 @@ sub parse_diff {
}
push @{$hunk[-1]{TEXT}}, $diff[$i];
push @{$hunk[-1]{DISPLAY}},
- ($diff_use_color ? $colored[$i] : $diff[$i]);
+ (@colored ? $colored[$i] : $diff[$i]);
}
return @hunk;
}
diff --git a/git-compat-util.h b/git-compat-util.h
index 4743954..49d4029 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -279,9 +279,6 @@ extern char *gitdirname(char *);
#endif
#include <openssl/ssl.h>
#include <openssl/err.h>
-#ifdef NO_HMAC_CTX_CLEANUP
-#define HMAC_CTX_cleanup HMAC_cleanup
-#endif
#endif
/* On most systems <netdb.h> would have given us this, but
@@ -412,7 +409,9 @@ extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf,
extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
#ifndef NO_OPENSSL
#ifdef APPLE_COMMON_CRYPTO
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 02c0445..d50c85e 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -1156,7 +1156,7 @@ sub prepDirForOutput
# FUTURE: This would more accurately emulate CVS by sending
# another copy of sticky after processing the files in that
# directory. Or intermediate: perhaps send all sticky's for
- # $seendirs after after processing all files.
+ # $seendirs after processing all files.
}
# update \n
@@ -2824,7 +2824,7 @@ sub statecleanup
}
# Return working directory CVS revision "1.X" out
-# of the the working directory "entries" state, for the given filename.
+# of the working directory "entries" state, for the given filename.
# This is prefixed with a dash if the file is scheduled for removal
# when it is committed.
sub revparse
@@ -2935,7 +2935,7 @@ sub filecleanup
return $filename;
}
-# Remove prependdir from the path, so that is is relative to the directory
+# Remove prependdir from the path, so that it is relative to the directory
# the CVS client was started from, rather than the top of the project.
# Essentially the inverse of filecleanup().
sub remove_prependdir
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 2b11b1d..84d6cc0 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -44,10 +44,10 @@ launch_merge_tool () {
"$GIT_DIFF_PATH_TOTAL" "$MERGED"
if use_ext_cmd
then
- printf "Launch '%s' [Y/n]: " \
+ printf "Launch '%s' [Y/n]? " \
"$GIT_DIFFTOOL_EXTCMD"
else
- printf "Launch '%s' [Y/n]: " "$merge_tool"
+ printf "Launch '%s' [Y/n]? " "$merge_tool"
fi
read ans || return
if test "$ans" = n
diff --git a/git-difftool.perl b/git-difftool.perl
index 488d14b..ebd13ba 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -138,6 +138,7 @@ sub setup_dir_diff
my %submodule;
my %symlink;
my @working_tree = ();
+ my %working_tree_dups = ();
my @rawdiff = split('\0', $diffrtn);
my $i = 0;
@@ -188,6 +189,10 @@ EOF
}
if ($rmode ne $null_mode) {
+ # Avoid duplicate working_tree entries
+ if ($working_tree_dups{$dst_path}++) {
+ next;
+ }
my ($use, $wt_sha1) = use_wt_file($repo, $workdir,
$dst_path, $rsha1);
if ($use) {
@@ -273,7 +278,7 @@ EOF
# temporary file to both the left and right directories to show the
# change in the recorded SHA1 for the submodule.
for my $path (keys %submodule) {
- my $ok;
+ my $ok = 0;
if (defined($submodule{$path}{left})) {
$ok = write_to_file("$ldir/$path",
"Subproject commit $submodule{$path}{left}");
@@ -289,7 +294,7 @@ EOF
# shows only the link itself, not the contents of the link target.
# This loop replicates that behavior.
for my $path (keys %symlink) {
- my $ok;
+ my $ok = 0;
if (defined($symlink{$path}{left})) {
$ok = write_to_file("$ldir/$path",
$symlink{$path}{left});
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 8643f74..dc2fd1b 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -44,6 +44,12 @@ esac
# MRC is the current "merge reference commit"
# MRT is the current "merge result tree"
+if ! git diff-index --quiet --cached HEAD --
+then
+ echo "Error: Your local changes to the following files would be overwritten by merge"
+ git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
+ exit 2
+fi
MRC=$(git rev-parse --verify -q $head)
MRT=$(git write-tree)
NON_FF_MERGE=0
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 54ac8e4..9abd00b 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -100,7 +100,7 @@ check_unchanged () {
while true
do
echo "$MERGED seems unchanged."
- printf "Was the merge successful? [y/n] "
+ printf "Was the merge successful [y/n]? "
read answer || return 1
case "$answer" in
y*|Y*) return 0 ;;
@@ -372,3 +372,28 @@ get_merge_tool () {
fi
echo "$merge_tool"
}
+
+mergetool_find_win32_cmd () {
+ executable=$1
+ sub_directory=$2
+
+ # Use $executable if it exists in $PATH
+ if type -p "$executable" >/dev/null 2>&1
+ then
+ printf '%s' "$executable"
+ return
+ fi
+
+ # Look for executable in the typical locations
+ for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
+ cut -d '=' -f 2- | sort -u)
+ do
+ if test -n "$directory" && test -x "$directory/$sub_directory/$executable"
+ then
+ printf '%s' "$directory/$sub_directory/$executable"
+ return
+ fi
+ done
+
+ printf '%s' "$executable"
+}
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9f77e3a..bf86270 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -126,7 +126,12 @@ resolve_deleted_merge () {
case "$ans" in
[mMcC]*)
git add -- "$MERGED"
- cleanup_temp_files --save-backup
+ if test "$merge_keep_backup" = "true"
+ then
+ cleanup_temp_files --save-backup
+ else
+ cleanup_temp_files
+ fi
return 0
;;
[dD]*)
@@ -135,6 +140,10 @@ resolve_deleted_merge () {
return 0
;;
[aA]*)
+ if test "$merge_keep_temporaries" = "false"
+ then
+ cleanup_temp_files
+ fi
return 1
;;
esac
@@ -282,8 +291,14 @@ merge_file () {
return
fi
- mv -- "$MERGED" "$BACKUP"
- cp -- "$BACKUP" "$MERGED"
+ if test -f "$MERGED"
+ then
+ mv -- "$MERGED" "$BACKUP"
+ cp -- "$BACKUP" "$MERGED"
+ fi
+ # Create a parent directory to handle delete/delete conflicts
+ # where the base's directory no longer exists.
+ mkdir -p "$(dirname "$MERGED")"
checkout_staged_file 1 "$MERGED" "$BASE"
checkout_staged_file 2 "$MERGED" "$LOCAL"
@@ -295,7 +310,9 @@ merge_file () {
describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE"
resolve_deleted_merge
- return
+ status=$?
+ rmdir -p "$(dirname "$MERGED")" 2>/dev/null
+ return $status
fi
if is_symlink "$local_mode" || is_symlink "$remote_mode"
@@ -396,7 +413,7 @@ done
prompt_after_failed_merge () {
while true
do
- printf "Continue merging other unresolved paths (y/n) ? "
+ printf "Continue merging other unresolved paths [y/n]? "
read ans || return 1
case "$ans" in
[yY]*)
diff --git a/git-p4.py b/git-p4.py
index 825b9f3..b6593cf 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1064,8 +1064,15 @@ class GitLFS(LargeFileSystem):
if pointerProcess.wait():
os.remove(contentFile)
die('git-lfs pointer command failed. Did you install the extension?')
- pointerContents = [i+'\n' for i in pointerFile.split('\n')[2:][:-1]]
- oid = pointerContents[1].split(' ')[1].split(':')[1][:-1]
+
+ # Git LFS removed the preamble in the output of the 'pointer' command
+ # starting from version 1.2.0. Check for the preamble here to support
+ # earlier versions.
+ # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
+ if pointerFile.startswith('Git LFS pointer for'):
+ pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
+
+ oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
localLargeFile = os.path.join(
os.getcwd(),
'.git', 'lfs', 'objects', oid[:2], oid[2:4],
@@ -1073,7 +1080,7 @@ class GitLFS(LargeFileSystem):
)
# LFS Spec states that pointer files should not have the executable bit set.
gitMode = '100644'
- return (gitMode, pointerContents, localLargeFile)
+ return (gitMode, pointerFile, localLargeFile)
def pushFile(self, localLargeFile):
uploadProcess = subprocess.Popen(
@@ -1160,6 +1167,15 @@ class P4UserMap:
self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
self.emails[output["Email"]] = output["User"]
+ mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
+ for mapUserConfig in gitConfigList("git-p4.mapUser"):
+ mapUser = mapUserConfigRegex.findall(mapUserConfig)
+ if mapUser and len(mapUser[0]) == 3:
+ user = mapUser[0][0]
+ fullname = mapUser[0][1]
+ email = mapUser[0][2]
+ self.users[user] = fullname + " <" + email + ">"
+ self.emails[email] = user
s = ''
for (key, val) in self.users.items():
@@ -2311,6 +2327,15 @@ class P4Sync(Command, P4UserMap):
fnum = fnum + 1
return files
+ def extractJobsFromCommit(self, commit):
+ jobs = []
+ jnum = 0
+ while commit.has_key("job%s" % jnum):
+ job = commit["job%s" % jnum]
+ jobs.append(job)
+ jnum = jnum + 1
+ return jobs
+
def stripRepoPath(self, path, prefixes):
"""When streaming files, this is called to map a p4 depot path
to where it should go in git. The prefixes are either
@@ -2656,6 +2681,7 @@ class P4Sync(Command, P4UserMap):
def commit(self, details, files, branch, parent = ""):
epoch = details["time"]
author = details["user"]
+ jobs = self.extractJobsFromCommit(details)
if self.verbose:
print('commit into {0}'.format(branch))
@@ -2683,6 +2709,8 @@ class P4Sync(Command, P4UserMap):
self.gitStream.write("data <<EOT\n")
self.gitStream.write(details["desc"])
+ if len(jobs) > 0:
+ self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
(','.join(self.branchPrefixes), details["change"]))
if len(details['options']) > 0:
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 55fe8d5..d3c3998 100644
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -56,11 +56,13 @@ get_remote_merge_branch () {
error_on_missing_default_upstream () {
cmd="$1"
op_type="$2"
- op_prep="$3"
+ op_prep="$3" # FIXME: op_prep is no longer used
example="$4"
branch_name=$(git symbolic-ref -q HEAD)
+ display_branch_name="${branch_name#refs/heads/}"
# If there's only one remote, use that in the suggestion
- remote="<remote>"
+ remote="$(gettext "<remote>")"
+ branch="$(gettext "<branch>")"
if test $(git remote | wc -l) = 1
then
remote=$(git remote)
@@ -68,22 +70,32 @@ error_on_missing_default_upstream () {
if test -z "$branch_name"
then
- echo "You are not currently on a branch. Please specify which
-branch you want to $op_type $op_prep. See git-${cmd}(1) for details.
-
- $example
-"
+ gettextln "You are not currently on a branch."
else
- echo "There is no tracking information for the current branch.
-Please specify which branch you want to $op_type $op_prep.
-See git-${cmd}(1) for details
-
- $example
-
-If you wish to set tracking information for this branch you can do so with:
-
- git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
-"
+ gettextln "There is no tracking information for the current branch."
+ fi
+ case "$op_type" in
+ rebase)
+ gettextln "Please specify which branch you want to rebase against."
+ ;;
+ merge)
+ gettextln "Please specify which branch you want to merge with."
+ ;;
+ *)
+ echo >&2 "BUG: unknown operation type: $op_type"
+ exit 1
+ ;;
+ esac
+ eval_gettextln "See git-\${cmd}(1) for details."
+ echo
+ echo " $example"
+ echo
+ if test -n "$branch_name"
+ then
+ gettextln "If you wish to set tracking information for this branch you can do so with:"
+ echo
+ echo " git branch --set-upstream-to=$remote/$branch $display_branch_name"
+ echo
fi
exit 1
}
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4cde685..6e96abc 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -82,6 +82,7 @@ rewritten_pending="$state_dir"/rewritten-pending
cr=$(printf "\015")
strategy_args=${strategy:+--strategy=$strategy}
+test -n "$strategy_opts" &&
eval '
for strategy_opt in '"$strategy_opts"'
do
@@ -191,7 +192,6 @@ make_patch () {
die_with_patch () {
echo "$1" > "$state_dir"/stopped-sha
make_patch "$1"
- git rerere
die "$2"
}
@@ -548,7 +548,8 @@ do_next () {
mark_action_done
do_pick $sha1 "$rest"
- warn "Stopped at $sha1... $rest"
+ sha1_abbrev=$(git rev-parse --short $sha1)
+ warn "Stopped at $sha1_abbrev... $rest"
exit_with_patch $sha1 0
;;
squash|s|fixup|f)
@@ -865,12 +866,12 @@ add_exec_commands () {
# $3: the input filename
check_commit_sha () {
badsha=0
- if test -z $1
+ if test -z "$1"
then
badsha=1
else
sha1_verif="$(git rev-parse --verify --quiet $1^{commit})"
- if test -z $sha1_verif
+ if test -z "$sha1_verif"
then
badsha=1
fi
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 2cc2a6d..8d43db9 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -67,7 +67,9 @@ call_merge () {
GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
fi
test -z "$strategy" && strategy=recursive
- eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"'
+ # If cmt doesn't have a parent, don't include it as a base
+ base=$(git rev-parse --verify --quiet $cmt^)
+ eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
rv=$?
case "$rv" in
0)
diff --git a/git-rebase.sh b/git-rebase.sh
index cf60c43..44ede36 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -87,7 +87,10 @@ preserve_merges=
autosquash=
keep_empty=
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
-gpg_sign_opt=
+case "$(git config --bool commit.gpgsign)" in
+true) gpg_sign_opt=-S ;;
+*) gpg_sign_opt= ;;
+esac
read_basic_state () {
test -f "$state_dir/head-name" &&
@@ -248,6 +251,7 @@ do
;;
--exec=*)
cmd="${cmd}exec ${1#--exec=}${LF}"
+ test -z "$interactive_rebase" && interactive_rebase=implied
;;
--interactive)
interactive_rebase=explicit
@@ -348,12 +352,6 @@ do
done
test $# -gt 2 && usage
-if test -n "$cmd" &&
- test "$interactive_rebase" != explicit
-then
- die "$(gettext "The --exec option must be used with the --interactive option")"
-fi
-
if test -n "$action"
then
test -z "$in_progress" && die "$(gettext "No rebase in progress?")"
diff --git a/git-send-email.perl b/git-send-email.perl
index d356901..6958785 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -19,10 +19,10 @@
use 5.008;
use strict;
use warnings;
+use POSIX qw/strftime/;
use Term::ReadLine;
use Getopt::Long;
use Text::ParseWords;
-use Data::Dumper;
use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /;
use File::Spec::Functions qw(catfile);
@@ -533,7 +533,7 @@ my %parse_alias = (
$aliases{$alias} = \@addr
}}},
mailrc => sub { my $fh = shift; while (<$fh>) {
- if (/^alias\s+(\S+)\s+(.*)$/) {
+ if (/^alias\s+(\S+)\s+(.*?)\s*$/) {
# spaces delimit multiple addresses
$aliases{$1} = [ quotewords('\s+', 0, $2) ];
}}},
@@ -827,9 +827,10 @@ if (defined $sender) {
# But it's a no-op to run sanitize_address on an already sanitized address.
$sender = sanitize_address($sender);
+my $to_whom = "To whom should the emails be sent (if anyone)?";
my $prompting = 0;
if (!@initial_to && !defined $to_cmd) {
- my $to = ask("Who should the emails be sent to (if any)? ",
+ my $to = ask("$to_whom ",
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later
@@ -924,7 +925,7 @@ sub validate_address {
cleanup_compose_files();
exit(0);
}
- $address = ask("Who should the email be sent to (if any)? ",
+ $address = ask("$to_whom ",
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
}
@@ -949,7 +950,7 @@ my ($message_id_stamp, $message_id_serial);
sub make_message_id {
my $uniq;
if (!defined $message_id_stamp) {
- $message_id_stamp = sprintf("%s-%s", time, $$);
+ $message_id_stamp = strftime("%Y%m%d%H%M%S.$$", gmtime(time));
$message_id_serial = 0;
}
$message_id_serial++;
@@ -964,7 +965,7 @@ sub make_message_id {
require Sys::Hostname;
$du_part = 'user@' . Sys::Hostname::hostname();
}
- my $message_id_template = "<%s-git-send-email-%s>";
+ my $message_id_template = "<%s-%s>";
$message_id = sprintf($message_id_template, $uniq, $du_part);
#print "new message id = $message_id\n"; # Was useful for debugging
}
diff --git a/git-stash.sh b/git-stash.sh
index c7c65e2..c7509e8 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -185,7 +185,7 @@ store_stash () {
git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit
ret=$?
- test $ret != 0 && test -z $quiet &&
+ test $ret != 0 && test -z "$quiet" &&
die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
return $ret
}
@@ -277,7 +277,7 @@ save_stash () {
git clean --force --quiet -d $CLEAN_X_OPTION
fi
- if test "$keep_index" = "t" && test -n $i_tree
+ if test "$keep_index" = "t" && test -n "$i_tree"
then
git read-tree --reset -u $i_tree
fi
diff --git a/git-submodule.sh b/git-submodule.sh
index 43c68de..7fe8a51 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -8,7 +8,7 @@ dashless=$(basename "$0" | sed -e 's/-/ /')
USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: $dashless [--quiet] init [--] [<path>...]
- or: $dashless [--quiet] deinit [-f|--force] [--] <path>...
+ or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--reference <repository>] [--recursive] [--] [<path>...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
or: $dashless [--quiet] foreach [--recursive] <command>
@@ -46,114 +46,6 @@ prefix=
custom_name=
depth=
-# The function takes at most 2 arguments. The first argument is the
-# URL that navigates to the submodule origin repo. When relative, this URL
-# is relative to the superproject origin URL repo. The second up_path
-# argument, if specified, is the relative path that navigates
-# from the submodule working tree to the superproject working tree.
-#
-# The output of the function is the origin URL of the submodule.
-#
-# The output will either be an absolute URL or filesystem path (if the
-# superproject origin URL is an absolute URL or filesystem path,
-# respectively) or a relative file system path (if the superproject
-# origin URL is a relative file system path).
-#
-# When the output is a relative file system path, the path is either
-# relative to the submodule working tree, if up_path is specified, or to
-# the superproject working tree otherwise.
-resolve_relative_url ()
-{
- remote=$(get_default_remote)
- remoteurl=$(git config "remote.$remote.url") ||
- remoteurl=$(pwd) # the repository is its own authoritative upstream
- url="$1"
- remoteurl=${remoteurl%/}
- sep=/
- up_path="$2"
-
- case "$remoteurl" in
- *:*|/*)
- is_relative=
- ;;
- ./*|../*)
- is_relative=t
- ;;
- *)
- is_relative=t
- remoteurl="./$remoteurl"
- ;;
- esac
-
- while test -n "$url"
- do
- case "$url" in
- ../*)
- url="${url#../}"
- case "$remoteurl" in
- */*)
- remoteurl="${remoteurl%/*}"
- ;;
- *:*)
- remoteurl="${remoteurl%:*}"
- sep=:
- ;;
- *)
- if test -z "$is_relative" || test "." = "$remoteurl"
- then
- die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
- else
- remoteurl=.
- fi
- ;;
- esac
- ;;
- ./*)
- url="${url#./}"
- ;;
- *)
- break;;
- esac
- done
- remoteurl="$remoteurl$sep${url%/}"
- echo "${is_relative:+${up_path}}${remoteurl#./}"
-}
-
-# Resolve a path to be relative to another path. This is intended for
-# converting submodule paths when git-submodule is run in a subdirectory
-# and only handles paths where the directory separator is '/'.
-#
-# The output is the first argument as a path relative to the second argument,
-# which defaults to $wt_prefix if it is omitted.
-relative_path ()
-{
- local target curdir result
- target=$1
- curdir=${2-$wt_prefix}
- curdir=${curdir%/}
- result=
-
- while test -n "$curdir"
- do
- case "$target" in
- "$curdir/"*)
- target=${target#"$curdir"/}
- break
- ;;
- esac
-
- result="${result}../"
- if test "$curdir" = "${curdir%/*}"
- then
- curdir=
- else
- curdir="${curdir%/*}"
- fi
- done
-
- echo "$result$target"
-}
-
die_if_unmatched ()
{
if test "$1" = "#unmatched"
@@ -192,6 +84,17 @@ isnumber()
n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
}
+# Sanitize the local git environment for use within a submodule. We
+# can't simply use clear_local_git_env since we want to preserve some
+# of the settings from GIT_CONFIG_PARAMETERS.
+sanitize_submodule_env()
+{
+ save_config=$GIT_CONFIG_PARAMETERS
+ clear_local_git_env
+ GIT_CONFIG_PARAMETERS=$save_config
+ export GIT_CONFIG_PARAMETERS
+}
+
#
# Add a new submodule to the working tree, .gitmodules and the index
#
@@ -281,7 +184,7 @@ cmd_add()
die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
# dereference source url relative to parent's url
- realrepo=$(resolve_relative_url "$repo") || exit
+ realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
;;
*:*|/*)
# absolute url
@@ -347,9 +250,9 @@ Use -f if you really want to add it." >&2
echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
fi
fi
- git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit
+ git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit
(
- clear_local_git_env
+ sanitize_submodule_env
cd "$sm_path" &&
# ash fails to wordsplit ${branch:+-b "$branch"...}
case "$branch" in
@@ -407,20 +310,23 @@ cmd_foreach()
# command in the subshell (and a recursive call to this function)
exec 3<&0
- git submodule--helper list --prefix "$wt_prefix"|
+ {
+ git submodule--helper list --prefix "$wt_prefix" ||
+ echo "#unmatched"
+ } |
while read mode sha1 stage sm_path
do
die_if_unmatched "$mode"
if test -e "$sm_path"/.git
then
- displaypath=$(relative_path "$sm_path")
- say "$(eval_gettext "Entering '\$prefix\$displaypath'")"
+ displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
+ say "$(eval_gettext "Entering '\$displaypath'")"
name=$(git submodule--helper name "$sm_path")
(
prefix="$prefix$sm_path/"
- clear_local_git_env
+ sanitize_submodule_env
cd "$sm_path" &&
- sm_path=$(relative_path "$sm_path") &&
+ sm_path=$(git submodule--helper relative-path "$sm_path" "$wt_prefix") &&
# we make $path available to scripts ...
path=$sm_path &&
if test $# -eq 1
@@ -434,7 +340,7 @@ cmd_foreach()
cmd_foreach "--recursive" "$@"
fi
) <&3 3<&- ||
- die "$(eval_gettext "Stopping at '\$prefix\$displaypath'; script returned non-zero status.")"
+ die "$(eval_gettext "Stopping at '\$displaypath'; script returned non-zero status.")"
fi
done
}
@@ -467,50 +373,7 @@ cmd_init()
shift
done
- git submodule--helper list --prefix "$wt_prefix" "$@" |
- while read mode sha1 stage sm_path
- do
- die_if_unmatched "$mode"
- name=$(git submodule--helper name "$sm_path") || exit
-
- displaypath=$(relative_path "$sm_path")
-
- # Copy url setting when it is not set yet
- if test -z "$(git config "submodule.$name.url")"
- then
- url=$(git config -f .gitmodules submodule."$name".url)
- test -z "$url" &&
- die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")"
-
- # Possibly a url relative to parent
- case "$url" in
- ./*|../*)
- url=$(resolve_relative_url "$url") || exit
- ;;
- esac
- git config submodule."$name".url "$url" ||
- die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")"
-
- say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")"
- fi
-
- # Copy "update" setting when it is not set yet
- if upd="$(git config -f .gitmodules submodule."$name".update)" &&
- test -n "$upd" &&
- test -z "$(git config submodule."$name".update)"
- then
- case "$upd" in
- checkout | rebase | merge | none)
- ;; # known modes of updating
- *)
- echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
- upd=none
- ;;
- esac
- git config submodule."$name".update "$upd" ||
- die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
- fi
- done
+ git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} "$@"
}
#
@@ -521,6 +384,7 @@ cmd_init()
cmd_deinit()
{
# parse $args after "submodule ... deinit".
+ deinit_all=
while test $# -ne 0
do
case "$1" in
@@ -530,6 +394,9 @@ cmd_deinit()
-q|--quiet)
GIT_QUIET=1
;;
+ --all)
+ deinit_all=t
+ ;;
--)
shift
break
@@ -544,18 +411,26 @@ cmd_deinit()
shift
done
- if test $# = 0
+ if test -n "$deinit_all" && test "$#" -ne 0
+ then
+ echo >&2 "$(eval_gettext "pathspec and --all are incompatible")"
+ usage
+ fi
+ if test $# = 0 && test -z "$deinit_all"
then
- die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")"
+ die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")"
fi
- git submodule--helper list --prefix "$wt_prefix" "$@" |
+ {
+ git submodule--helper list --prefix "$wt_prefix" "$@" ||
+ echo "#unmatched"
+ } |
while read mode sha1 stage sm_path
do
die_if_unmatched "$mode"
name=$(git submodule--helper name "$sm_path") || exit
- displaypath=$(relative_path "$sm_path")
+ displaypath=$(git submodule--helper relative-path "$sm_path" "$wt_prefix")
# Remove the submodule work tree (unless the user already did it)
if test -d "$sm_path"
@@ -592,14 +467,14 @@ cmd_deinit()
}
is_tip_reachable () (
- clear_local_git_env
+ sanitize_submodule_env &&
cd "$1" &&
rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
test -z "$rev"
)
fetch_in_submodule () (
- clear_local_git_env
+ sanitize_submodule_env &&
cd "$1" &&
case "$2" in
'')
@@ -663,6 +538,14 @@ cmd_update()
--depth=*)
depth=$1
;;
+ -j|--jobs)
+ case "$2" in '') usage ;; esac
+ jobs="--jobs=$2"
+ shift
+ ;;
+ --jobs=*)
+ jobs=$1
+ ;;
--)
shift
break
@@ -682,17 +565,21 @@ cmd_update()
cmd_init "--" "$@" || return
fi
- cloned_modules=
- git submodule--helper list --prefix "$wt_prefix" "$@" | {
+ {
+ git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
+ ${wt_prefix:+--prefix "$wt_prefix"} \
+ ${prefix:+--recursive-prefix "$prefix"} \
+ ${update:+--update "$update"} \
+ ${reference:+--reference "$reference"} \
+ ${depth:+--depth "$depth"} \
+ ${jobs:+$jobs} \
+ "$@" || echo "#unmatched"
+ } | {
err=
- while read mode sha1 stage sm_path
+ while read mode sha1 stage just_cloned sm_path
do
die_if_unmatched "$mode"
- if test "$stage" = U
- then
- echo >&2 "Skipping unmerged submodule $prefix$sm_path"
- continue
- fi
+
name=$(git submodule--helper name "$sm_path") || exit
url=$(git config submodule."$name".url)
branch=$(get_submodule_config "$name" branch master)
@@ -707,31 +594,14 @@ cmd_update()
fi
fi
- displaypath=$(relative_path "$prefix$sm_path")
+ displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
- if test "$update_module" = "none"
+ if test $just_cloned -eq 1
then
- echo "Skipping submodule '$displaypath'"
- continue
- fi
-
- if test -z "$url"
- then
- # Only mention uninitialized submodules when its
- # path have been specified
- test "$#" != "0" &&
- say "$(eval_gettext "Submodule path '\$displaypath' not initialized
-Maybe you want to use 'update --init'?")"
- continue
- fi
-
- if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git
- then
- git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$prefix" --path "$sm_path" --name "$name" --url "$url" "$reference" "$depth" || exit
- cloned_modules="$cloned_modules;$name"
subsha1=
+ update_module=checkout
else
- subsha1=$(clear_local_git_env; cd "$sm_path" &&
+ subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify HEAD) ||
die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
fi
@@ -741,11 +611,11 @@ Maybe you want to use 'update --init'?")"
if test -z "$nofetch"
then
# Fetch remote before determining tracking $sha1
- (clear_local_git_env; cd "$sm_path" && git-fetch) ||
+ (sanitize_submodule_env; cd "$sm_path" && git-fetch) ||
die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
fi
- remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote)
- sha1=$(clear_local_git_env; cd "$sm_path" &&
+ remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
+ sha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify "${remote_name}/${branch}") ||
die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
fi
@@ -774,13 +644,6 @@ Maybe you want to use 'update --init'?")"
die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")"
fi
- # Is this something we just cloned?
- case ";$cloned_modules;" in
- *";$name;"*)
- # then there is no local change to integrate
- update_module=checkout ;;
- esac
-
must_die_on_failure=
case "$update_module" in
checkout)
@@ -802,15 +665,15 @@ Maybe you want to use 'update --init'?")"
;;
!*)
command="${update_module#!}"
- die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")"
- say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")"
+ die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
+ say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
must_die_on_failure=yes
;;
*)
die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
esac
- if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
+ if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
then
say "$say_msg"
elif test -n "$must_die_on_failure"
@@ -825,8 +688,9 @@ Maybe you want to use 'update --init'?")"
if test -n "$recursive"
then
(
- prefix="$prefix$sm_path/"
- clear_local_git_env
+ prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix")
+ wt_prefix=
+ sanitize_submodule_env
cd "$sm_path" &&
eval cmd_update
)
@@ -864,7 +728,7 @@ Maybe you want to use 'update --init'?")"
set_name_rev () {
revname=$( (
- clear_local_git_env
+ sanitize_submodule_env
cd "$1" && {
git describe "$2" 2>/dev/null ||
git describe --tags "$2" 2>/dev/null ||
@@ -1008,7 +872,7 @@ cmd_summary() {
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
missing_dst=t
- display_name=$(relative_path "$name")
+ display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
total_commits=
case "$missing_src,$missing_dst" in
@@ -1120,13 +984,16 @@ cmd_status()
shift
done
- git submodule--helper list --prefix "$wt_prefix" "$@" |
+ {
+ git submodule--helper list --prefix "$wt_prefix" "$@" ||
+ echo "#unmatched"
+ } |
while read mode sha1 stage sm_path
do
die_if_unmatched "$mode"
name=$(git submodule--helper name "$sm_path") || exit
url=$(git config submodule."$name".url)
- displaypath=$(relative_path "$prefix$sm_path")
+ displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
if test "$stage" = U
then
say "U$sha1 $displaypath"
@@ -1148,7 +1015,7 @@ cmd_status()
else
if test -z "$cached"
then
- sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
+ sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD)
fi
set_name_rev "$sm_path" "$sha1"
say "+$sha1 $displaypath$revname"
@@ -1158,7 +1025,8 @@ cmd_status()
then
(
prefix="$displaypath/"
- clear_local_git_env
+ sanitize_submodule_env
+ wt_prefix=
cd "$sm_path" &&
eval cmd_status
) ||
@@ -1197,7 +1065,10 @@ cmd_sync()
esac
done
cd_to_toplevel
- git submodule--helper list --prefix "$wt_prefix" "$@" |
+ {
+ git submodule--helper list --prefix "$wt_prefix" "$@" ||
+ echo "#unmatched"
+ } |
while read mode sha1 stage sm_path
do
die_if_unmatched "$mode"
@@ -1213,9 +1084,9 @@ cmd_sync()
# guarantee a trailing /
up_path=${up_path%/}/ &&
# path from submodule work tree to submodule origin repo
- sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
+ sub_origin_url=$(git submodule--helper resolve-relative-url "$url" "$up_path") &&
# path from superproject work tree to submodule origin repo
- super_config_url=$(resolve_relative_url "$url") || exit
+ super_config_url=$(git submodule--helper resolve-relative-url "$url") || exit
;;
*)
sub_origin_url="$url"
@@ -1225,14 +1096,14 @@ cmd_sync()
if git config "submodule.$name.url" >/dev/null 2>/dev/null
then
- displaypath=$(relative_path "$prefix$sm_path")
+ displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
git config submodule."$name".url "$super_config_url"
if test -e "$sm_path"/.git
then
(
- clear_local_git_env
+ sanitize_submodule_env
cd "$sm_path"
remote=$(get_default_remote)
git config remote."$remote".url "$sub_origin_url"
diff --git a/git.c b/git.c
index 6cc0c07..968a8a4 100644
--- a/git.c
+++ b/git.c
@@ -15,7 +15,6 @@ const char git_more_info_string[] =
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept.");
-static struct startup_info git_startup_info;
static int use_pager = -1;
static char *orig_cwd;
static const char *env_names[] = {
@@ -637,8 +636,6 @@ int main(int argc, char **av)
const char *cmd;
int done_help = 0;
- startup_info = &git_startup_info;
-
cmd = git_extract_argv0_path(argv[0]);
if (!cmd)
cmd = "git-help";
diff --git a/git.spec.in b/git.spec.in
deleted file mode 100644
index d61d537..0000000
--- a/git.spec.in
+++ /dev/null
@@ -1,330 +0,0 @@
-# Pass --without docs to rpmbuild if you don't want the documentation
-
-Name: git
-Version: @@VERSION@@
-Release: 1%{?dist}
-Summary: Core git tools
-License: GPL
-Group: Development/Tools
-URL: http://kernel.org/pub/software/scm/git/
-Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
-BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: perl-Git = %{version}-%{release}
-Requires: zlib >= 1.2, rsync, less, openssh-clients, expat
-Provides: git-core = %{version}-%{release}
-Obsoletes: git-core <= 1.5.4.2
-Obsoletes: git-p4
-
-%description
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-The git rpm installs the core tools with minimal dependencies. To
-install all git packages, including tools for integrating with other
-SCMs, install the git-all meta-package.
-
-%package all
-Summary: Meta-package to pull in all git tools
-Group: Development/Tools
-Requires: git = %{version}-%{release}
-Requires: git-svn = %{version}-%{release}
-Requires: git-cvs = %{version}-%{release}
-Requires: git-arch = %{version}-%{release}
-Requires: git-email = %{version}-%{release}
-Requires: gitk = %{version}-%{release}
-Requires: gitweb = %{version}-%{release}
-Requires: git-gui = %{version}-%{release}
-Obsoletes: git <= 1.5.4.2
-
-%description all
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-This is a dummy package which brings in all subpackages.
-
-%package svn
-Summary: Git tools for importing Subversion repositories
-Group: Development/Tools
-Requires: git = %{version}-%{release}, subversion
-%description svn
-Git tools for importing Subversion repositories.
-
-%package cvs
-Summary: Git tools for importing CVS repositories
-Group: Development/Tools
-Requires: git = %{version}-%{release}, cvs, cvsps
-%description cvs
-Git tools for importing CVS repositories.
-
-%package arch
-Summary: Git tools for importing Arch repositories
-Group: Development/Tools
-Requires: git = %{version}-%{release}, tla
-%description arch
-Git tools for importing Arch repositories.
-
-%package email
-Summary: Git tools for sending email
-Group: Development/Tools
-Requires: git = %{version}-%{release}
-%description email
-Git tools for sending email.
-
-%package gui
-Summary: Git GUI tool
-Group: Development/Tools
-Requires: git = %{version}-%{release}, tk >= 8.4
-%description gui
-Git GUI tool
-
-%package -n gitk
-Summary: Git revision tree visualiser ('gitk')
-Group: Development/Tools
-Requires: git = %{version}-%{release}, tk >= 8.4
-%description -n gitk
-Git revision tree visualiser ('gitk')
-
-%package -n gitweb
-Summary: Git web interface
-Group: Development/Tools
-Requires: git = %{version}-%{release}
-%description -n gitweb
-Browsing git repository on the web
-
-%package -n perl-Git
-Summary: Perl interface to Git
-Group: Development/Libraries
-Requires: git = %{version}-%{release}
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl(Error)
-BuildRequires: perl(ExtUtils::MakeMaker)
-
-%description -n perl-Git
-Perl interface to Git
-
-%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%prep
-%setup -q
-
-%build
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
- %{path_settings} \
- all %{!?_without_docs: doc}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
- %{path_settings} \
- INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
-test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
-(find $RPM_BUILD_ROOT%{_libexecdir}/git-core -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
-(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
-%if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
-%else
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-%endif
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f bin-man-doc-files
-%defattr(-,root,root)
-%{_datadir}/git-core/
-%doc README COPYING Documentation/*.txt
-%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
-%{!?_without_docs: %doc Documentation/technical}
-%{_sysconfdir}/bash_completion.d
-
-%files svn
-%defattr(-,root,root)
-%{_libexecdir}/git-core/*svn*
-%doc Documentation/*svn*.txt
-%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
-%{!?_without_docs: %doc Documentation/*svn*.html }
-
-%files cvs
-%defattr(-,root,root)
-%doc Documentation/*git-cvs*.txt
-%{_bindir}/git-cvsserver
-%{_libexecdir}/git-core/*cvs*
-%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
-%{!?_without_docs: %doc Documentation/*git-cvs*.html }
-
-%files arch
-%defattr(-,root,root)
-%doc Documentation/git-archimport.txt
-%{_libexecdir}/git-core/git-archimport
-%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
-%{!?_without_docs: %doc Documentation/git-archimport.html }
-
-%files email
-%defattr(-,root,root)
-%doc Documentation/*email*.txt
-%{_libexecdir}/git-core/*email*
-%{!?_without_docs: %{_mandir}/man1/*email*.1*}
-%{!?_without_docs: %doc Documentation/*email*.html }
-
-%files gui
-%defattr(-,root,root)
-%{_libexecdir}/git-core/git-gui
-%{_libexecdir}/git-core/git-citool
-%{_libexecdir}/git-core/git-gui--askpass
-%{_datadir}/git-gui/
-%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
-%{!?_without_docs: %doc Documentation/git-gui.html}
-%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
-%{!?_without_docs: %doc Documentation/git-citool.html}
-
-%files -n gitk
-%defattr(-,root,root)
-%doc Documentation/*gitk*.txt
-%{_bindir}/*gitk*
-%{_datadir}/gitk/
-%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
-%{!?_without_docs: %doc Documentation/*gitk*.html }
-
-%files -n gitweb
-%defattr(-,root,root)
-%doc gitweb/README gitweb/INSTALL Documentation/*gitweb*.txt
-%{_datadir}/gitweb
-%{!?_without_docs: %{_mandir}/man1/*gitweb*.1*}
-%{!?_without_docs: %{_mandir}/man5/*gitweb*.5*}
-%{!?_without_docs: %doc Documentation/*gitweb*.html }
-
-%files -n perl-Git -f perl-files
-%defattr(-,root,root)
-
-%files all
-# No files for you!
-
-%changelog
-* Sun Sep 18 2011 Jakub Narebski <jnareb@gmail.com>
-- Add gitweb manpages to 'gitweb' subpackage
-
-* Wed Jun 30 2010 Junio C Hamano <gitster@pobox.com>
-- Add 'gitweb' subpackage.
-
-* Fri Mar 26 2010 Ian Ward Comfort <icomfort@stanford.edu>
-- Ship bash completion support from contrib/ in the core package.
-
-* Sun Jan 31 2010 Junio C Hamano <gitster@pobox.com>
-- Do not use %define inside %{!?...} construct.
-
-* Sat Jan 30 2010 Junio C Hamano <gitster@pobox.com>
-- We don't ship Python bits until a real foreign scm interface comes.
-
-* Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com>
-- fixed broken git help -w after renaming the git-core package to git.
-
-* Fri Sep 12 2008 Quy Tonthat <qtonthat@gmail.com>
-- move git-cvsserver to bindir.
-
-* Sun Jun 15 2008 Junio C Hamano <gitster@pobox.com>
-- Remove curl from Requires list.
-
-* Fri Feb 15 2008 Kristian Høgsberg <krh@redhat.com>
-- Rename git-core to just git and rename meta package from git to git-all.
-
-* Sun Feb 03 2008 James Bowes <jbowes@dangerouslyinc.com>
-- Add a BuildRequires for gettext
-
-* Fri Jan 11 2008 Junio C Hamano <gitster@pobox.com>
-- Include gitk message files
-
-* Sun Jan 06 2008 James Bowes <jbowes@dangerouslyinc.com>
-- Make the metapackage require the same version of the subpackages.
-
-* Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com>
-- Adjust htmldir to point at /usr/share/doc/git-core-$version/
-
-* Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca>
-- Removed p4import.
-
-* Tue Jun 26 2007 Quy Tonthat <qtonthat@gmail.com>
-- Fixed problems looking for wrong manpages.
-
-* Thu Jun 21 2007 Shawn O. Pearce <spearce@spearce.org>
-- Added documentation files for git-gui
-
-* Tue May 13 2007 Quy Tonthat <qtonthat@gmail.com>
-- Added lib files for git-gui
-- Added Documentation/technical (As needed by Git Users Manual)
-
-* Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com>
-- Added howto files
-
-* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
-- Added the git-p4 package: Perforce import stuff.
-
-* Mon Feb 13 2007 Nicolas Pitre <nico@fluxnic.net>
-- Update core package description (Git isn't as stupid as it used to be)
-
-* Mon Feb 12 2007 Junio C Hamano <junkio@cox.net>
-- Add git-gui and git-citool.
-
-* Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1
-- Change subpackage names to git-<name> instead of git-core-<name>
-- Create empty root package which brings in all subpackages
-- Rename git-tk -> gitk
-
-* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1
-- zlib dependency fix
-- Minor cleanups from split
-- Move arch import to separate package as well
-
-* Tue Sep 27 2005 Jim Radford <radford@blackbean.org>
-- Move programs with non-standard dependencies (svn, cvs, email)
- into separate packages
-
-* Tue Sep 27 2005 H. Peter Anvin <hpa@zytor.com>
-- parallelize build
-- COPTS -> CFLAGS
-
-* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
-- update to 0.99.6
-
-* Fri Sep 16 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Linus noticed that less is required, added to the dependencies
-
-* Sun Sep 11 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Updated dependencies
-- Don't assume manpages are gzipped
-
-* Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> 0.99.4-4
-- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
-- use RPM_OPT_FLAGS in spec file, drop patch0
-
-* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.99.4-3
-- use dist tag to differentiate between branches
-- use rpm optflags by default (patch0)
-- own %{_datadir}/git-core/
-
-* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org>
-- update spec file to fix Buildroot, Requires, and drop Vendor
-
-* Sun Aug 07 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
-- Redid the description
-- Cut overlong make line, loosened changelog a bit
-- I think Junio (or perhaps OSDL?) should be vendor...
-
-* Thu Jul 14 2005 Eric Biederman <ebiederm@xmission.com>
-- Add the man pages, and the --without docs build option
-
-* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
-- initial git spec file
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 05d7910..2fddf75 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3935,6 +3935,9 @@ sub run_highlighter {
close $fd;
open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
+ quote_command($^X, '-CO', '-MEncode=decode,FB_DEFAULT', '-pse',
+ '$_ = decode($fe, $_, FB_DEFAULT) if !utf8::decode($_);',
+ '--', "-fe=$fallback_encoding")." | ".
quote_command($highlight_bin).
" --replace-tabs=8 --fragment --syntax $syntax |"
or die_error(500, "Couldn't open file or run syntax highlighter");
diff --git a/gpg-interface.c b/gpg-interface.c
index 3dc2fe3..c4b1e8c 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -219,11 +219,9 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
args_gpg[0] = gpg_program;
fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
if (fd < 0)
- return error(_("could not create temporary file '%s': %s"),
- path, strerror(errno));
+ return error_errno(_("could not create temporary file '%s'"), path);
if (write_in_full(fd, signature, signature_size) < 0)
- return error(_("failed writing detached signature to '%s': %s"),
- path, strerror(errno));
+ return error_errno(_("failed writing detached signature to '%s'"), path);
close(fd);
gpg.argv = args_gpg;
@@ -237,6 +235,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
return error(_("could not run gpg."));
}
+ sigchain_push(SIGPIPE, SIG_IGN);
write_in_full(gpg.in, payload, payload_size);
close(gpg.in);
@@ -250,6 +249,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
close(gpg.out);
ret = finish_command(&gpg);
+ sigchain_pop(SIGPIPE);
unlink_or_warn(path);
diff --git a/grep.c b/grep.c
index 528b652..ec6f7ff 100644
--- a/grep.c
+++ b/grep.c
@@ -1732,7 +1732,7 @@ static int grep_source_load_file(struct grep_source *gs)
if (lstat(filename, &st) < 0) {
err_ret:
if (errno != ENOENT)
- error(_("'%s': %s"), filename, strerror(errno));
+ error_errno(_("failed to stat '%s'"), filename);
return -1;
}
if (!S_ISREG(st.st_mode))
@@ -1743,7 +1743,7 @@ static int grep_source_load_file(struct grep_source *gs)
goto err_ret;
data = xmallocz(size);
if (st.st_size != read_in_full(i, data, size)) {
- error(_("'%s': short read %s"), filename, strerror(errno));
+ error_errno(_("'%s': short read"), filename);
close(i);
free(data);
return -1;
diff --git a/http-backend.c b/http-backend.c
index 8870a26..2148814 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -484,9 +484,9 @@ static int show_head_ref(const char *refname, const struct object_id *oid,
const char *target = resolve_ref_unsafe(refname,
RESOLVE_REF_READING,
unused.hash, NULL);
- const char *target_nons = strip_namespace(target);
- strbuf_addf(buf, "ref: %s\n", target_nons);
+ if (target)
+ strbuf_addf(buf, "ref: %s\n", strip_namespace(target));
} else {
strbuf_addf(buf, "%s\n", oid_to_hex(oid));
}
diff --git a/http-push.c b/http-push.c
index bd60668..a092f02 100644
--- a/http-push.c
+++ b/http-push.c
@@ -211,7 +211,7 @@ static void curl_setup_http(CURL *curl, const char *url,
static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
{
struct strbuf buf = STRBUF_INIT;
- struct curl_slist *dav_headers = NULL;
+ struct curl_slist *dav_headers = http_copy_default_headers();
if (options & DAV_HEADER_IF) {
strbuf_addf(&buf, "If: (<%s>)", lock->token);
@@ -417,7 +417,7 @@ static void start_put(struct transfer_request *request)
static void start_move(struct transfer_request *request)
{
struct active_request_slot *slot;
- struct curl_slist *dav_headers = NULL;
+ struct curl_slist *dav_headers = http_copy_default_headers();
slot = get_active_slot();
slot->callback_func = process_response;
@@ -845,7 +845,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
char *ep;
char timeout_header[25];
struct remote_lock *lock = NULL;
- struct curl_slist *dav_headers = NULL;
+ struct curl_slist *dav_headers = http_copy_default_headers();
struct xml_ctx ctx;
char *escaped;
@@ -1126,7 +1126,7 @@ static void remote_ls(const char *path, int flags,
struct slot_results results;
struct strbuf in_buffer = STRBUF_INIT;
struct buffer out_buffer = { STRBUF_INIT, 0 };
- struct curl_slist *dav_headers = NULL;
+ struct curl_slist *dav_headers = http_copy_default_headers();
struct xml_ctx ctx;
struct remote_ls_ctx ls;
@@ -1204,7 +1204,7 @@ static int locking_available(void)
struct slot_results results;
struct strbuf in_buffer = STRBUF_INIT;
struct buffer out_buffer = { STRBUF_INIT, 0 };
- struct curl_slist *dav_headers = NULL;
+ struct curl_slist *dav_headers = http_copy_default_headers();
struct xml_ctx ctx;
int lock_flags = 0;
char *escaped;
@@ -1312,10 +1312,10 @@ static struct object_list **process_tree(struct tree *tree,
while (tree_entry(&desc, &entry))
switch (object_type(entry.mode)) {
case OBJ_TREE:
- p = process_tree(lookup_tree(entry.sha1), p);
+ p = process_tree(lookup_tree(entry.oid->hash), p);
break;
case OBJ_BLOB:
- p = process_blob(lookup_blob(entry.sha1), p);
+ p = process_blob(lookup_blob(entry.oid->hash), p);
break;
default:
/* Subproject commit - not in this repository */
diff --git a/http.c b/http.c
index 69da445..df6dd01 100644
--- a/http.c
+++ b/http.c
@@ -114,6 +114,7 @@ static unsigned long http_auth_methods = CURLAUTH_ANY;
static struct curl_slist *pragma_header;
static struct curl_slist *no_pragma_header;
+static struct curl_slist *extra_http_headers;
static struct active_request_slot *active_queue_head;
@@ -293,7 +294,7 @@ static int http_options(const char *var, const char *value, void *cb)
return git_config_string(&http_proxy_authmethod, var, value);
if (!strcmp("http.cookiefile", var))
- return git_config_string(&curl_cookie_file, var, value);
+ return git_config_pathname(&curl_cookie_file, var, value);
if (!strcmp("http.savecookies", var)) {
curl_save_cookies = git_config_bool(var, value);
return 0;
@@ -323,6 +324,19 @@ static int http_options(const char *var, const char *value, void *cb)
#endif
}
+ if (!strcmp("http.extraheader", var)) {
+ if (!value) {
+ return config_error_nonbool(var);
+ } else if (!*value) {
+ curl_slist_free_all(extra_http_headers);
+ extra_http_headers = NULL;
+ } else {
+ extra_http_headers =
+ curl_slist_append(extra_http_headers, value);
+ }
+ return 0;
+ }
+
/* Fall back on the default ones */
return git_default_config(var, value, cb);
}
@@ -446,8 +460,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
rc = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&ka, len);
if (rc < 0)
- warning("unable to set SO_KEEPALIVE on socket %s",
- strerror(errno));
+ warning_errno("unable to set SO_KEEPALIVE on socket");
return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
}
@@ -605,7 +618,10 @@ static CURL *get_curl_handle(void)
if (curl_http_proxy) {
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
#if LIBCURL_VERSION_NUM >= 0x071800
- if (starts_with(curl_http_proxy, "socks5"))
+ if (starts_with(curl_http_proxy, "socks5h"))
+ curl_easy_setopt(result,
+ CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
+ else if (starts_with(curl_http_proxy, "socks5"))
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
else if (starts_with(curl_http_proxy, "socks4a"))
@@ -675,8 +691,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
if (remote)
var_override(&http_proxy_authmethod, remote->http_proxy_authmethod);
- pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
- no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
+ pragma_header = curl_slist_append(http_copy_default_headers(),
+ "Pragma: no-cache");
+ no_pragma_header = curl_slist_append(http_copy_default_headers(),
+ "Pragma:");
#ifdef USE_CURL_MULTI
{
@@ -762,6 +780,9 @@ void http_cleanup(void)
#endif
curl_global_cleanup();
+ curl_slist_free_all(extra_http_headers);
+ extra_http_headers = NULL;
+
curl_slist_free_all(pragma_header);
pragma_header = NULL;
@@ -1160,6 +1181,16 @@ int run_one_slot(struct active_request_slot *slot,
return handle_curl_result(results);
}
+struct curl_slist *http_copy_default_headers(void)
+{
+ struct curl_slist *headers = NULL, *h;
+
+ for (h = extra_http_headers; h; h = h->next)
+ headers = curl_slist_append(headers, h->data);
+
+ return headers;
+}
+
static CURLcode curlinfo_strbuf(CURL *curl, CURLINFO info, struct strbuf *buf)
{
char *ptr;
@@ -1377,7 +1408,7 @@ static int http_request(const char *url,
{
struct active_request_slot *slot;
struct slot_results results;
- struct curl_slist *headers = NULL;
+ struct curl_slist *headers = http_copy_default_headers();
struct strbuf buf = STRBUF_INIT;
const char *accept_language;
int ret;
@@ -1891,8 +1922,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
}
if (freq->localfile < 0) {
- error("Couldn't create temporary file %s: %s",
- freq->tmpfile, strerror(errno));
+ error_errno("Couldn't create temporary file %s", freq->tmpfile);
goto abort;
}
@@ -1937,8 +1967,8 @@ struct http_object_request *new_http_object_request(const char *base_url,
prev_posn = 0;
lseek(freq->localfile, 0, SEEK_SET);
if (ftruncate(freq->localfile, 0) < 0) {
- error("Couldn't truncate temporary file %s: %s",
- freq->tmpfile, strerror(errno));
+ error_errno("Couldn't truncate temporary file %s",
+ freq->tmpfile);
goto abort;
}
}
diff --git a/http.h b/http.h
index 4ef4bbd..36f558b 100644
--- a/http.h
+++ b/http.h
@@ -106,6 +106,7 @@ extern void step_active_slots(void);
extern void http_init(struct remote *remote, const char *url,
int proactive_auth);
extern void http_cleanup(void);
+extern struct curl_slist *http_copy_default_headers(void);
extern long int git_curl_ipresolve;
extern int active_requests;
diff --git a/ident.c b/ident.c
index 6e12582..139c528 100644
--- a/ident.c
+++ b/ident.c
@@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf)
mailname = fopen("/etc/mailname", "r");
if (!mailname) {
if (errno != ENOENT)
- warning("cannot open /etc/mailname: %s",
- strerror(errno));
+ warning_errno("cannot open /etc/mailname");
return -1;
}
if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
if (ferror(mailname))
- warning("cannot read /etc/mailname: %s",
- strerror(errno));
+ warning_errno("cannot read /etc/mailname");
strbuf_release(&mailnamebuf);
fclose(mailname);
return -1;
@@ -125,7 +123,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus)
char buf[1024];
if (gethostname(buf, sizeof(buf))) {
- warning("cannot get host name: %s", strerror(errno));
+ warning_errno("cannot get host name");
strbuf_addstr(out, "(none)");
*is_bogus = 1;
return;
@@ -351,15 +349,17 @@ const char *fmt_ident(const char *name, const char *email,
if (want_name) {
int using_default = 0;
if (!name) {
+ if (strict && ident_use_config_only
+ && !(ident_config_given & IDENT_NAME_GIVEN)) {
+ fputs(env_hint, stderr);
+ die("no name was given and auto-detection is disabled");
+ }
name = ident_default_name();
using_default = 1;
if (strict && default_name_is_bogus) {
fputs(env_hint, stderr);
die("unable to auto-detect name (got '%s')", name);
}
- if (strict && ident_use_config_only
- && !(ident_config_given & IDENT_NAME_GIVEN))
- die("user.useConfigOnly set but no name given");
}
if (!*name) {
struct passwd *pw;
@@ -374,14 +374,16 @@ const char *fmt_ident(const char *name, const char *email,
}
if (!email) {
+ if (strict && ident_use_config_only
+ && !(ident_config_given & IDENT_MAIL_GIVEN)) {
+ fputs(env_hint, stderr);
+ die("no email was given and auto-detection is disabled");
+ }
email = ident_default_email();
if (strict && default_email_is_bogus) {
fputs(env_hint, stderr);
die("unable to auto-detect email address (got '%s')", email);
}
- if (strict && ident_use_config_only
- && !(ident_config_given & IDENT_MAIL_GIVEN))
- die("user.useConfigOnly set but no mail given");
}
strbuf_reset(&ident);
diff --git a/imap-send.c b/imap-send.c
index 2c52027..938c691 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -287,17 +287,20 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
SSL_library_init();
SSL_load_error_strings();
- if (use_tls_only)
- meth = TLSv1_method();
- else
- meth = SSLv23_method();
-
+ meth = SSLv23_method();
if (!meth) {
ssl_socket_perror("SSLv23_method");
return -1;
}
ctx = SSL_CTX_new(meth);
+ if (!ctx) {
+ ssl_socket_perror("SSL_CTX_new");
+ return -1;
+ }
+
+ if (use_tls_only)
+ SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
if (verify)
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
@@ -862,7 +865,6 @@ static char hexchar(unsigned int b)
static char *cram(const char *challenge_64, const char *user, const char *pass)
{
int i, resp_len, encoded_len, decoded_len;
- HMAC_CTX hmac;
unsigned char hash[16];
char hex[33];
char *response, *response_64, *challenge;
@@ -877,10 +879,8 @@ static char *cram(const char *challenge_64, const char *user, const char *pass)
(unsigned char *)challenge_64, encoded_len);
if (decoded_len < 0)
die("invalid challenge %s", challenge_64);
- HMAC_Init(&hmac, (unsigned char *)pass, strlen(pass), EVP_md5());
- HMAC_Update(&hmac, (unsigned char *)challenge, decoded_len);
- HMAC_Final(&hmac, hash, NULL);
- HMAC_CTX_cleanup(&hmac);
+ if (!HMAC(EVP_md5(), pass, strlen(pass), (unsigned char *)challenge, decoded_len, hash, NULL))
+ die("HMAC error");
hex[32] = 0;
for (i = 0; i < 16; i++) {
@@ -890,7 +890,7 @@ static char *cram(const char *challenge_64, const char *user, const char *pass)
/* response: "<user> <digest in hex>" */
response = xstrfmt("%s %s", user, hex);
- resp_len = strlen(response) + 1;
+ resp_len = strlen(response);
response_64 = xmallocz(ENCODED_SIZE(resp_len));
encoded_len = EVP_EncodeBlock((unsigned char *)response_64,
@@ -1095,11 +1095,6 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
srvc->pass = xstrdup(cred.password);
}
- if (CAP(NOLOGIN)) {
- fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n", srvc->user, srvc->host);
- goto bail;
- }
-
if (srvc->auth_method) {
struct imap_cmd_cb cb;
@@ -1123,6 +1118,11 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
goto bail;
}
} else {
+ if (CAP(NOLOGIN)) {
+ fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n",
+ srvc->user, srvc->host);
+ goto bail;
+ }
if (!imap->buf.sock.ssl)
imap_warn("*** IMAP Warning *** Password is being "
"sent in the clear\n");
diff --git a/list-objects.c b/list-objects.c
index 917cc5d..f3ca6aa 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -110,16 +110,16 @@ static void process_tree(struct rev_info *revs,
if (S_ISDIR(entry.mode))
process_tree(revs,
- lookup_tree(entry.sha1),
+ lookup_tree(entry.oid->hash),
show, base, entry.path,
cb_data);
else if (S_ISGITLINK(entry.mode))
- process_gitlink(revs, entry.sha1,
+ process_gitlink(revs, entry.oid->hash,
show, base, entry.path,
cb_data);
else
process_blob(revs,
- lookup_blob(entry.sha1),
+ lookup_blob(entry.oid->hash),
show, base, entry.path,
cb_data);
}
diff --git a/ll-merge.c b/ll-merge.c
index ff4a43a..ad8be42 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
assert(opts);
/*
- * The tentative merge result is the or common ancestor for an internal merge.
+ * The tentative merge result is the common ancestor for an
+ * internal merge. For the final merge, it is "ours" by
+ * default but -Xours/-Xtheirs can tweak the choice.
*/
if (opts->virtual_ancestor) {
stolen = orig;
@@ -383,8 +385,12 @@ int ll_merge(mmbuffer_t *result_buf,
}
}
driver = find_ll_merge_driver(ll_driver_name);
- if (opts->virtual_ancestor && driver->recursive)
- driver = find_ll_merge_driver(driver->recursive);
+
+ if (opts->virtual_ancestor) {
+ if (driver->recursive)
+ driver = find_ll_merge_driver(driver->recursive);
+ marker_size += 2;
+ }
return driver->fn(driver, result_buf, path, ancestor, ancestor_label,
ours, our_label, theirs, their_label,
opts, marker_size);
diff --git a/lockfile.c b/lockfile.c
index 80d056d..9268cdf 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -149,13 +149,15 @@ static int lock_file_timeout(struct lock_file *lk, const char *path,
void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
{
if (err == EEXIST) {
- strbuf_addf(buf, "Unable to create '%s.lock': %s.\n\n"
- "If no other git process is currently running, this probably means a\n"
- "git process crashed in this repository earlier. Make sure no other git\n"
- "process is running and remove the file manually to continue.",
+ strbuf_addf(buf, _("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."),
absolute_path(path), strerror(err));
} else
- strbuf_addf(buf, "Unable to create '%s.lock': %s",
+ strbuf_addf(buf, _("Unable to create '%s.lock': %s"),
absolute_path(path), strerror(err));
}
diff --git a/log-tree.c b/log-tree.c
index 60f9839..78a5381 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -683,6 +683,7 @@ void show_log(struct rev_info *opt)
ctx.fmt = opt->commit_format;
ctx.mailmap = opt->mailmap;
ctx.color = opt->diffopt.use_color;
+ ctx.expand_tabs_in_log = opt->expand_tabs_in_log;
ctx.output_encoding = get_log_output_encoding();
if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
ctx.from_ident = &opt->from_ident;
diff --git a/mailmap.c b/mailmap.c
index f4a0f1c..b5c521f 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -189,8 +189,7 @@ static int read_mailmap_file(struct string_list *map, const char *filename,
if (!f) {
if (errno == ENOENT)
return 0;
- return error("unable to open mailmap at %s: %s",
- filename, strerror(errno));
+ return error_errno("unable to open mailmap at %s", filename);
}
while (fgets(buffer, sizeof(buffer), f) != NULL)
@@ -250,7 +249,8 @@ int read_mailmap(struct string_list *map, char **repo_abbrev)
git_mailmap_blob = "HEAD:.mailmap";
err |= read_mailmap_file(map, ".mailmap", repo_abbrev);
- err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev);
+ if (startup_info->have_repository)
+ err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev);
err |= read_mailmap_file(map, git_mailmap_file, repo_abbrev);
return err;
}
diff --git a/match-trees.c b/match-trees.c
index 1ce0954..396b733 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -48,17 +48,17 @@ static int score_matches(unsigned mode1, unsigned mode2, const char *path)
}
static void *fill_tree_desc_strict(struct tree_desc *desc,
- const unsigned char *hash)
+ const struct object_id *hash)
{
void *buffer;
enum object_type type;
unsigned long size;
- buffer = read_sha1_file(hash, &type, &size);
+ buffer = read_sha1_file(hash->hash, &type, &size);
if (!buffer)
- die("unable to read tree (%s)", sha1_to_hex(hash));
+ die("unable to read tree (%s)", oid_to_hex(hash));
if (type != OBJ_TREE)
- die("%s is not a tree", sha1_to_hex(hash));
+ die("%s is not a tree", oid_to_hex(hash));
init_tree_desc(desc, buffer, size);
return buffer;
}
@@ -73,7 +73,7 @@ static int base_name_entries_compare(const struct name_entry *a,
/*
* Inspect two trees, and give a score that tells how similar they are.
*/
-static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
+static int score_trees(const struct object_id *hash1, const struct object_id *hash2)
{
struct tree_desc one;
struct tree_desc two;
@@ -104,7 +104,7 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
else if (cmp > 0)
/* path2 does not appear in one */
score += score_missing(e2.mode, e2.path);
- else if (hashcmp(e1.sha1, e2.sha1))
+ else if (oidcmp(e1.oid, e2.oid))
/* they are different */
score += score_differs(e1.mode, e2.mode, e1.path);
else
@@ -119,8 +119,8 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2)
/*
* Match one itself and its subtrees with two and pick the best match.
*/
-static void match_trees(const unsigned char *hash1,
- const unsigned char *hash2,
+static void match_trees(const struct object_id *hash1,
+ const struct object_id *hash2,
int *best_score,
char **best_match,
const char *base,
@@ -131,7 +131,7 @@ static void match_trees(const unsigned char *hash1,
while (one.size) {
const char *path;
- const unsigned char *elem;
+ const struct object_id *elem;
unsigned mode;
int score;
@@ -191,15 +191,15 @@ static int splice_tree(const unsigned char *hash1,
while (desc.size) {
const char *name;
unsigned mode;
- const unsigned char *sha1;
+ const struct object_id *oid;
- sha1 = tree_entry_extract(&desc, &name, &mode);
+ oid = tree_entry_extract(&desc, &name, &mode);
if (strlen(name) == toplen &&
!memcmp(name, prefix, toplen)) {
if (!S_ISDIR(mode))
die("entry %s in tree %s is not a tree",
name, sha1_to_hex(hash1));
- rewrite_here = (unsigned char *) sha1;
+ rewrite_here = (unsigned char *) oid->hash;
break;
}
update_tree_entry(&desc);
@@ -229,9 +229,9 @@ static int splice_tree(const unsigned char *hash1,
* other hand, it could cover tree one and we might need to pick a
* subtree of it.
*/
-void shift_tree(const unsigned char *hash1,
- const unsigned char *hash2,
- unsigned char *shifted,
+void shift_tree(const struct object_id *hash1,
+ const struct object_id *hash2,
+ struct object_id *shifted,
int depth_limit)
{
char *add_prefix;
@@ -262,7 +262,7 @@ void shift_tree(const unsigned char *hash1,
match_trees(hash2, hash1, &del_score, &del_prefix, "", depth_limit);
/* Assume we do not have to do any shifting */
- hashcpy(shifted, hash2);
+ oidcpy(shifted, hash2);
if (add_score < del_score) {
/* We need to pick a subtree of two */
@@ -271,16 +271,16 @@ void shift_tree(const unsigned char *hash1,
if (!*del_prefix)
return;
- if (get_tree_entry(hash2, del_prefix, shifted, &mode))
+ if (get_tree_entry(hash2->hash, del_prefix, shifted->hash, &mode))
die("cannot find path %s in tree %s",
- del_prefix, sha1_to_hex(hash2));
+ del_prefix, oid_to_hex(hash2));
return;
}
if (!*add_prefix)
return;
- splice_tree(hash1, add_prefix, hash2, shifted);
+ splice_tree(hash1->hash, add_prefix, hash2->hash, shifted->hash);
}
/*
@@ -288,22 +288,22 @@ void shift_tree(const unsigned char *hash1,
* Unfortunately we cannot fundamentally tell which one to
* be prefixed, as recursive merge can work in either direction.
*/
-void shift_tree_by(const unsigned char *hash1,
- const unsigned char *hash2,
- unsigned char *shifted,
+void shift_tree_by(const struct object_id *hash1,
+ const struct object_id *hash2,
+ struct object_id *shifted,
const char *shift_prefix)
{
- unsigned char sub1[20], sub2[20];
+ struct object_id sub1, sub2;
unsigned mode1, mode2;
unsigned candidate = 0;
/* Can hash2 be a tree at shift_prefix in tree hash1? */
- if (!get_tree_entry(hash1, shift_prefix, sub1, &mode1) &&
+ if (!get_tree_entry(hash1->hash, shift_prefix, sub1.hash, &mode1) &&
S_ISDIR(mode1))
candidate |= 1;
/* Can hash1 be a tree at shift_prefix in tree hash2? */
- if (!get_tree_entry(hash2, shift_prefix, sub2, &mode2) &&
+ if (!get_tree_entry(hash2->hash, shift_prefix, sub2.hash, &mode2) &&
S_ISDIR(mode2))
candidate |= 2;
@@ -313,19 +313,19 @@ void shift_tree_by(const unsigned char *hash1,
int score;
candidate = 0;
- score = score_trees(sub1, hash2);
+ score = score_trees(&sub1, hash2);
if (score > best_score) {
candidate = 1;
best_score = score;
}
- score = score_trees(sub2, hash1);
+ score = score_trees(&sub2, hash1);
if (score > best_score)
candidate = 2;
}
if (!candidate) {
/* Neither is plausible -- do not shift */
- hashcpy(shifted, hash2);
+ oidcpy(shifted, hash2);
return;
}
@@ -334,11 +334,11 @@ void shift_tree_by(const unsigned char *hash1,
* shift tree2 down by adding shift_prefix above it
* to match tree1.
*/
- splice_tree(hash1, shift_prefix, hash2, shifted);
+ splice_tree(hash1->hash, shift_prefix, hash2->hash, shifted->hash);
else
/*
* shift tree2 up by removing shift_prefix from it
* to match tree1.
*/
- hashcpy(shifted, sub2);
+ oidcpy(shifted, &sub2);
}
diff --git a/merge-recursive.c b/merge-recursive.c
index b880ae5..65cb5d6 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -29,9 +29,9 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two,
struct object_id shifted;
if (!*subtree_shift) {
- shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, 0);
+ shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
} else {
- shift_tree_by(one->object.oid.hash, two->object.oid.hash, shifted.hash,
+ shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
subtree_shift);
}
if (!oidcmp(&two->object.oid, &shifted))
@@ -622,7 +622,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
base_len = newpath.len;
while (string_list_has_string(&o->current_file_set, newpath.buf) ||
string_list_has_string(&o->current_directory_set, newpath.buf) ||
- file_exists(newpath.buf)) {
+ (!o->call_depth && file_exists(newpath.buf))) {
strbuf_setlen(&newpath, base_len);
strbuf_addf(&newpath, "_%d", suffix++);
}
@@ -1234,8 +1234,8 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
a->path, c1->path, ci->branch1,
b->path, c2->path, ci->branch2);
- remove_file(o, 1, a->path, would_lose_untracked(a->path));
- remove_file(o, 1, b->path, would_lose_untracked(b->path));
+ remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
+ remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
o->branch1, c1->path,
@@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o,
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s"),
conf, path, other_branch, path, new_path);
- if (o->call_depth)
- remove_file_from_cache(path);
update_file(o, 0, sha, mode, new_path);
if (o->call_depth)
remove_file_from_cache(path);
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 0000000..7b524d4
--- /dev/null
+++ b/mergetools/examdiff
@@ -0,0 +1,18 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
+ else
+ "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
+}
diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74a66d4..f3819d3 100644
--- a/mergetools/winmerge
+++ b/mergetools/winmerge
@@ -13,24 +13,5 @@ merge_cmd () {
}
translate_merge_tool_path() {
- # Use WinMergeU.exe if it exists in $PATH
- if type -p WinMergeU.exe >/dev/null 2>&1
- then
- printf WinMergeU.exe
- return
- fi
-
- # Look for WinMergeU.exe in the typical locations
- winmerge_exe="WinMerge/WinMergeU.exe"
- for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
- cut -d '=' -f 2- | sort -u)
- do
- if test -n "$directory" && test -x "$directory/$winmerge_exe"
- then
- printf '%s' "$directory/$winmerge_exe"
- return
- fi
- done
-
- printf WinMergeU.exe
+ mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}
diff --git a/notes.c b/notes.c
index 88cf474..e4e4854 100644
--- a/notes.c
+++ b/notes.c
@@ -446,7 +446,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
l = (struct leaf_node *)
xcalloc(1, sizeof(struct leaf_node));
hashcpy(l->key_sha1, object_sha1);
- hashcpy(l->val_sha1, entry.sha1);
+ hashcpy(l->val_sha1, entry.oid->hash);
if (len < 20) {
if (!S_ISDIR(entry.mode) || path_len != 2)
goto handle_non_note; /* not subtree */
@@ -493,7 +493,7 @@ handle_non_note:
}
strbuf_addstr(&non_note_path, entry.path);
add_non_note(t, strbuf_detach(&non_note_path, NULL),
- entry.mode, entry.sha1);
+ entry.mode, entry.oid->hash);
}
}
free(buf);
diff --git a/parse-options.c b/parse-options.c
index 47a9192..312a85d 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -110,6 +110,8 @@ static int get_value(struct parse_opt_ctx_t *p,
return 0;
case OPTION_COUNTUP:
+ if (*(int *)opt->value < 0)
+ *(int *)opt->value = 0;
*(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
return 0;
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -4,7 +4,7 @@
#include "sha1-lookup.h"
#include "patch-ids.h"
-static int commit_patch_id(struct commit *commit, struct diff_options *options,
+int commit_patch_id(struct commit *commit, struct diff_options *options,
unsigned char *sha1)
{
if (commit->parents)
diff --git a/patch-ids.h b/patch-ids.h
index c8c7ca1..eeb56b3 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -13,6 +13,8 @@ struct patch_ids {
struct patch_id_bucket *patches;
};
+int commit_patch_id(struct commit *commit, struct diff_options *options,
+ unsigned char *sha1);
int init_patch_ids(struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
diff --git a/path.c b/path.c
index 969b494..259aeed 100644
--- a/path.c
+++ b/path.c
@@ -5,6 +5,7 @@
#include "strbuf.h"
#include "string-list.h"
#include "dir.h"
+#include "worktree.h"
static int get_st_mode_bits(const char *path, int *mode)
{
@@ -134,7 +135,7 @@ static struct common_dir common_list[] = {
* definite
* definition
*
- * The trie would look look like:
+ * The trie would look like:
* root: len = 0, children a and d non-NULL, value = NULL.
* a: len = 2, contents = bc, value = (data for "abc")
* d: len = 2, contents = ef, children i non-NULL, value = (data for "def")
@@ -383,10 +384,11 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
update_common_dir(buf, git_dir_len, NULL);
}
-static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)
+static void do_git_path(const struct worktree *wt, struct strbuf *buf,
+ const char *fmt, va_list args)
{
int gitdir_len;
- strbuf_addstr(buf, get_git_dir());
+ strbuf_addstr(buf, get_worktree_git_dir(wt));
if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
strbuf_addch(buf, '/');
gitdir_len = buf->len;
@@ -400,7 +402,7 @@ char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
va_list args;
strbuf_reset(buf);
va_start(args, fmt);
- do_git_path(buf, fmt, args);
+ do_git_path(NULL, buf, fmt, args);
va_end(args);
return buf->buf;
}
@@ -409,7 +411,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- do_git_path(sb, fmt, args);
+ do_git_path(NULL, sb, fmt, args);
va_end(args);
}
@@ -418,7 +420,7 @@ const char *git_path(const char *fmt, ...)
struct strbuf *pathname = get_pathname();
va_list args;
va_start(args, fmt);
- do_git_path(pathname, fmt, args);
+ do_git_path(NULL, pathname, fmt, args);
va_end(args);
return pathname->buf;
}
@@ -428,7 +430,7 @@ char *git_pathdup(const char *fmt, ...)
struct strbuf path = STRBUF_INIT;
va_list args;
va_start(args, fmt);
- do_git_path(&path, fmt, args);
+ do_git_path(NULL, &path, fmt, args);
va_end(args);
return strbuf_detach(&path, NULL);
}
@@ -454,6 +456,16 @@ const char *mkpath(const char *fmt, ...)
return cleanup_path(pathname->buf);
}
+const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)
+{
+ struct strbuf *pathname = get_pathname();
+ va_list args;
+ va_start(args, fmt);
+ do_git_path(wt, pathname, fmt, args);
+ va_end(args);
+ return pathname->buf;
+}
+
static void do_submodule_path(struct strbuf *buf, const char *path,
const char *fmt, va_list args)
{
@@ -503,6 +515,35 @@ void strbuf_git_path_submodule(struct strbuf *buf, const char *path,
va_end(args);
}
+static void do_git_common_path(struct strbuf *buf,
+ const char *fmt,
+ va_list args)
+{
+ strbuf_addstr(buf, get_git_common_dir());
+ if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
+ strbuf_addch(buf, '/');
+ strbuf_vaddf(buf, fmt, args);
+ strbuf_cleanup_path(buf);
+}
+
+const char *git_common_path(const char *fmt, ...)
+{
+ struct strbuf *pathname = get_pathname();
+ va_list args;
+ va_start(args, fmt);
+ do_git_common_path(pathname, fmt, args);
+ va_end(args);
+ return pathname->buf;
+}
+
+void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ do_git_common_path(sb, fmt, args);
+ va_end(args);
+}
+
int validate_headref(const char *path)
{
struct stat st;
@@ -702,17 +743,17 @@ static int calc_shared_perm(int mode)
{
int tweak;
- if (shared_repository < 0)
- tweak = -shared_repository;
+ if (get_shared_repository() < 0)
+ tweak = -get_shared_repository();
else
- tweak = shared_repository;
+ tweak = get_shared_repository();
if (!(mode & S_IWUSR))
tweak &= ~0222;
if (mode & S_IXUSR)
/* Copy read bits to execute bits */
tweak |= (tweak & 0444) >> 2;
- if (shared_repository < 0)
+ if (get_shared_repository() < 0)
mode = (mode & ~0777) | tweak;
else
mode |= tweak;
@@ -725,7 +766,7 @@ int adjust_shared_perm(const char *path)
{
int old_mode, new_mode;
- if (!shared_repository)
+ if (!get_shared_repository())
return 0;
if (get_st_mode_bits(path, &old_mode) < 0)
return -1;
diff --git a/perl/Git.pm b/perl/Git.pm
index 49eb88a..ce7e4e8 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -393,7 +393,7 @@ sub command_close_pipe {
Execute the given C<COMMAND> in the same way as command_output_pipe()
does but return both an input pipe filehandle and an output pipe filehandle.
-The function will return return C<($pid, $pipe_in, $pipe_out, $ctx)>.
+The function will return C<($pid, $pipe_in, $pipe_out, $ctx)>.
See C<command_close_bidi_pipe()> for details.
=cut
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b2c14e2..d94d01c 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -97,7 +97,8 @@ sub resolve_local_globs {
"existing: $existing\n",
" globbed: $refname\n";
}
- my $u = (::cmt_metadata("$refname"))[0];
+ my $u = (::cmt_metadata("$refname"))[0] or die
+ "$refname: no associated commit metadata\n";
$u =~ s!^\Q$url\E(/|$)!! or die
"$refname: '$url' not found in '$u'\n";
if ($pathname ne $u) {
diff --git a/po/bg.po b/po/bg.po
index ac6f103..ce75f39 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -65,6 +65,9 @@
# term управлÑваща дума (за git-bisect)
# mergetag етикет при Ñливане
# delta - разлика, делта, обект-разлика
+# peeled tag - проÑледен етикет - когато етикет Ñочи към друг етикет, а не подаване и проÑледÑваме подобно на Ñимволна връзка
+# strip - премахвам (за компонент при филтриране)
+# unrelated histories - незавиÑими иÑтории
# ----
# „$var“ - може да не Ñработва за shell има gettext и eval_gettext - проверка - намират Ñе леÑно по „$
# ========================
@@ -109,8 +112,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-22 22:50+0800\n"
-"PO-Revision-Date: 2015-12-28 11:32+0200\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-29 15:23+0300\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -133,7 +136,7 @@ msgstr ""
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФÐЙЛ“\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:101 builtin/merge.c:1225
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува)."
@@ -177,25 +180,25 @@ msgstr "ФОРМÐТ"
msgid "archive format"
msgstr "ФОРМÐТ на архива"
-#: archive.c:430 builtin/log.c:1229
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
-msgstr "префикÑ"
+msgstr "ПРЕФИКС"
#: archive.c:431
msgid "prepend prefix to each pathname in the archive"
-msgstr "добавÑне на този Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ ÐºÑŠÐ¼ вÑеки път в архива"
+msgstr "добавÑне на този ПРЕФИКС към вÑеки път в архива"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536
-#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446
-#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
+#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
-msgstr "файл"
+msgstr "ФÐЙЛ"
#: archive.c:433 builtin/archive.c:89
msgid "write the archive to this file"
-msgstr "запазване на архива в този файл"
+msgstr "запазване на архива в този ФÐЙЛ"
#: archive.c:435
msgid "read .gitattributes in working directory"
@@ -221,7 +224,8 @@ msgstr "добро компреÑиране"
msgid "list supported archive formats"
msgstr "извеждане на ÑпиÑъка Ñ Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð°Ð½Ð¸Ñ‚Ðµ формати"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "хранилище"
@@ -229,7 +233,7 @@ msgstr "хранилище"
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтеглÑне на архива от отдалеченото ХРÐÐИЛИЩЕ"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
msgid "command"
msgstr "команда"
@@ -237,7 +241,7 @@ msgstr "команда"
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: attr.c:265
+#: attr.c:263
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -245,85 +249,102 @@ msgstr ""
"Отрицателните шаблони Ñе игнорират в атрибутите на git.\n"
"Ðко ви Ñ‚Ñ€Ñбва начална удивителна, ползвайте „\\!“."
-#: branch.c:61
+#: 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"
+"информациÑта за ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ чрез:\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:84
+#: branch.c:93
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
"Клонът „%s“ ще Ñледи клона „%s“ от отдалеченото хранилище „%s“ чрез "
"пребазиране."
-#: branch.c:85
+#: branch.c:94
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "Клонът „%s“ ще Ñледи клона „%s“ от отдалеченото хранилище „%s“."
-#: branch.c:89
+#: branch.c:98
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
"Клонът „%s“ ще Ñледи клона „%s“ от локалното хранилище чрез пребазиране."
-#: branch.c:90
+#: branch.c:99
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "Клонът „%s“ ще Ñледи клона „%s“ от локалното хранилище."
-#: branch.c:95
+#: branch.c:104
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "Клонът „%s“ ще Ñледи Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ чрез пребазиране."
-#: branch.c:96
+#: branch.c:105
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "Клонът „%s“ ще Ñледи Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“."
-#: branch.c:100
+#: branch.c:109
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "Клонът „%s“ ще Ñледи Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“ чрез пребазиране."
-#: branch.c:101
+#: branch.c:110
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "Клонът „%s“ ще Ñледи Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“."
-#: branch.c:134
+#: 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:163
+#: branch.c:185
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "„%s“ не е позволено име за клон."
-#: branch.c:168
+#: branch.c:190
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Вече ÑъщеÑтвува клон Ñ Ð¸Ð¼Ðµ „%s“."
-#: branch.c:176
+#: branch.c:198
msgid "Cannot force update the current branch."
msgstr "ТекущиÑÑ‚ клон не може да бъде принудително обновен."
-#: branch.c:196
+#: branch.c:218
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Зададените наÑтройки за Ñледенето Ñа грешни — началото „%s“ не е клон."
-#: branch.c:198
+#: branch.c:220
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заÑвениÑÑ‚ отдалечен клон „%s“ не ÑъщеÑтвува"
-#: branch.c:200
+#: branch.c:222
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -342,26 +363,31 @@ msgstr ""
"може да използвате „git push -u“, за да наÑтроите към кой клон да Ñе "
"изтлаÑква."
-#: branch.c:244
+#: branch.c:266
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ðеправилно име на обект: „%s“"
-#: branch.c:264
+#: branch.c:286
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "ДвуÑмиÑлено име на обект: „%s“"
-#: branch.c:269
+#: branch.c:291
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ðеправилно мÑÑто за начало на клон: „%s“"
-#: branch.c:322
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "УказателÑÑ‚ „HEAD“ на работното дърво „%s“ не е обновен"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -372,7 +398,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна чаÑÑ‚: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да Ñе отвори"
@@ -381,10 +407,10 @@ msgstr "„%s“ не може да Ñе отвори"
msgid "Repository lacks these prerequisite commits:"
msgstr "Ð’ хранилището липÑват Ñледните необходими подаваниÑ:"
-#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
-#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
-#: builtin/shortlog.c:158
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "неуÑпешно наÑтройване на обхождането на верÑиите"
@@ -424,21 +450,21 @@ msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателÑÑ‚ „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде Ñъздаден"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши уÑпешно"
@@ -447,8 +473,8 @@ msgstr "Командата „git index-pack“ не завърши уÑпешн
msgid "invalid color value: %.*s"
msgstr "неправилна ÑтойноÑÑ‚ за цвÑÑ‚: %.*s"
-#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
-#: builtin/am.c:2149
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да Ñе анализира"
@@ -462,28 +488,27 @@ msgstr "%s %s не е подаване!"
msgid "memory exhausted"
msgstr "паметта Ñвърши"
-#: config.c:474 config.c:476
+#: config.c:475 config.c:477
#, c-format
-msgid "bad config file line %d in %s"
-msgstr "неправилен ред %d в „%s“"
+msgid "bad config line %d in %s %s"
+msgstr "неправилен ред %d в наÑтройката %s „%s“"
-#: config.c:592
+#: config.c:593
#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr ""
-"неправилна чиÑлова ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“ в раздела „%s“: %s"
+msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
+msgstr "неправилна чиÑлова ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“ в %s „%s“: %s"
-#: config.c:594
+#: config.c:595
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна чиÑлова ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“: %s"
-#: config.c:679
+#: config.c:680
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð½Ðµ може да бъде открита: „%s“"
-#: config.c:757 config.c:768
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компреÑиране: %d"
@@ -493,42 +518,50 @@ msgstr "неправилно ниво на компреÑиране: %d"
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за Ñъздаването на обекти: %s"
-#: config.c:1216
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "неправилни наÑтройки от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´"
-#: config.c:1277
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:1601
+#: config.c:1629
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната ÑтойноÑÑ‚ „%s“ от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´"
-#: config.c:1603
+#: config.c:1631
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна наÑтройка „%s“ във файла „%s“ на ред â„–%d"
-#: config.c:1662
+#: config.c:1690
#, c-format
msgid "%s has multiple values"
msgstr "зададени Ñа нÑколко ÑтойноÑти за „%s“"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "„%s“ не може да Ñе зададе да е „%s“"
+
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "„%s“ не може да Ñе премахне"
+
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "неуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите: %s"
+msgid "failed write to rev-list"
+msgstr "неуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "ÑтандартниÑÑ‚ вход на ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите не може да бъде затворен: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "ÑтандартниÑÑ‚ вход на ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите не може да бъде затворен"
#: date.c:95
msgid "in the future"
@@ -603,28 +636,28 @@ msgstr[1] "преди %lu години"
msgid "failed to read orderfile '%s'"
msgstr "файлът Ñ Ð¿Ð¾Ð´Ñ€ÐµÐ´Ð±Ð°Ñ‚Ð° на ÑъответÑтвиÑта „%s“ не може да бъде прочетен"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "ТърÑене на Ð¿Ñ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð¸Ñ Ð½Ð° обекти Ñъчетани Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" ÐеуÑпешно разпознаване на „%s“ като процент-праг за ÑтатиÑтиката по "
"директории\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Ðепознат параметър „%s“ за ÑтатиÑтиката по директории'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Ðепозната ÑтойноÑÑ‚ „%s“ за наÑтройката „diff.submodule“"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -633,17 +666,17 @@ msgstr ""
"Грешки в наÑтройката „diff.dirstat“:\n"
"%s"
-#: diff.c:3000
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуÑпешно. Спиране на работата при „%s“"
-#: diff.c:3396
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "ОпциÑта „--follow“ изиÑква точно един път"
-#: diff.c:3559
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -652,20 +685,21 @@ msgstr ""
"Ðеразпознат параметър към опциÑта „--dirstat/-X“:\n"
"%s"
-#: diff.c:3573
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Ðеразпознат параметър към опциÑта „--submodule“: „%s“"
-#: dir.c:1915
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "името и верÑиÑта на Ñдрото не бÑха получени"
-#: dir.c:1998
-msgid "Untracked cache is disabled on this system."
-msgstr "Кеша за неÑледените файлове е изключен на тази ÑиÑтема"
+#: dir.c:1942
+msgid "Untracked cache is disabled on this system or location."
+msgstr ""
+"Кеша за неÑледените файлове е изключен на тази ÑиÑтема или меÑтоположение."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "Програмата „gpg“ не може да бъде Ñтартирана."
@@ -679,43 +713,43 @@ msgstr "Програмата „gpg“ не подпиÑа данните."
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "Програмата „gpg“ не уÑÐ¿Ñ Ð´Ð° Ñъздаде Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“: %s"
+msgid "could not create temporary file '%s'"
+msgstr "Програмата не уÑÐ¿Ñ Ð´Ð° Ñъздаде Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "Програмата „gpg“ не уÑÐ¿Ñ Ð´Ð° запише ÑамоÑтоÑÑ‚ÐµÐ»Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ ÐºÑŠÐ¼ „%s“: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "Програмата не уÑÐ¿Ñ Ð´Ð° запише ÑамоÑтоÑÑ‚ÐµÐ»Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð² „%s“"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът Ñочен от „%s“ не може да бъде прочетен"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "„%s“: „%s“"
+msgid "failed to stat '%s'"
+msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "„%s“: изчитането на „%s“ върна по-малко байтове от заÑвените"
+msgid "'%s': short read"
+msgstr "„%s“: изчитането върна по-малко байтове от заÑвените"
-#: help.c:207
+#: help.c:205
#, c-format
msgid "available git commands in '%s'"
msgstr "налични команди на git от „%s“"
-#: help.c:214
+#: help.c:212
msgid "git commands available from elsewhere on your $PATH"
msgstr "команди на git от други директории от „$PATH“"
-#: help.c:246
+#: help.c:244
msgid "These are common Git commands used in various situations:"
msgstr "Това Ñа най-чеÑто използваните команди на Git:"
-#: help.c:311
+#: help.c:309
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -724,11 +758,11 @@ msgstr ""
"Изглежда, че „%s“ е команда на git, но Ñ‚Ñ Ð½Ðµ може да\n"
"бъде изпълнена. ВероÑтно пакетът „git-%s“ е повреден."
-#: help.c:368
+#: help.c:366
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на ÑиÑтемата ви нÑма нито една команда на git."
-#: help.c:390
+#: help.c:388
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -739,17 +773,17 @@ msgstr ""
"ÑъщеÑтвува. Изпълнението автоматично продължава, като Ñе Ñчита, че имате "
"предвид „%s“"
-#: help.c:395
+#: help.c:393
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "Ñлед %0.1f Ñекунди…"
-#: help.c:402
+#: help.c:400
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-#: help.c:406 help.c:466
+#: help.c:404 help.c:464
msgid ""
"\n"
"Did you mean this?"
@@ -763,17 +797,41 @@ msgstr[1] ""
"\n"
"Команди Ñ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð¾ име Ñа:"
-#: help.c:462
+#: help.c:460
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
+#: lockfile.c:152
+#, 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 е пуÑнат в това хранилище, напр.\n"
+"редактор, Ñтартиран Ñ â€žgit commit“. Уверете Ñе, че вÑички подобни\n"
+"процеÑи Ñа Ñпрени и опитайте отново. Ðко това не помогне, вероÑтната\n"
+"причина е, че нÑкой Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° git в това хранилище е забил. За да\n"
+"продължите работа, ще Ñ‚Ñ€Ñбва ръчно да изтриете файла:"
+
+#: lockfile.c:160
+#, 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:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:722
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "неуÑпешно запиÑване на Ð½Ð¾Ð²Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ"
@@ -791,66 +849,66 @@ msgstr "неуÑпешно изпълнение на „addinfo_cache“ за п
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:686
+#: merge-recursive.c:689
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при Ñъздаването на Ð¿ÑŠÑ‚Ñ â€ž%s“%s"
-#: merge-recursive.c:697
+#: merge-recursive.c:700
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да Ñе оÑвободи мÑÑто за поддиректориÑ\n"
-#: merge-recursive.c:711 merge-recursive.c:732
+#: merge-recursive.c:714 merge-recursive.c:735
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директориÑ/файл."
-#: merge-recursive.c:722
+#: merge-recursive.c:725
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преуÑтановÑване на дейÑтвието, за да не Ñе изтрие неÑледениÑÑ‚ файл „%s“"
-#: merge-recursive.c:762
+#: merge-recursive.c:765
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:764
+#: merge-recursive.c:767
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) Ñе очакваше да е BLOB, а не е"
-#: merge-recursive.c:787 builtin/clone.c:369
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "директориÑта „%s“ не може да бъде отворена"
-#: merge-recursive.c:795
+#: merge-recursive.c:798
#, c-format
msgid "failed to symlink '%s'"
msgstr "неуÑпешно Ñъздаване на Ñимволната връзка „%s“"
-#: merge-recursive.c:798
+#: merge-recursive.c:801
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ÑÑно какво да Ñе прави Ñ Ð¾Ð±ÐµÐºÑ‚Ð° „%2$s“ (%3$s) Ñ Ð¿Ñ€Ð°Ð²Ð° за доÑтъп „%1$06o“"
-#: merge-recursive.c:936
+#: merge-recursive.c:939
msgid "Failed to execute internal merge"
msgstr "ÐеуÑпешно вътрешно Ñливане"
-#: merge-recursive.c:940
+#: merge-recursive.c:943
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да Ñе добави в базата Ñ Ð´Ð°Ð½Ð½Ð¸"
-#: merge-recursive.c:956
+#: merge-recursive.c:959
msgid "unsupported object type in the tree"
msgstr "в дървото има неподдържан вид обект"
-#: merge-recursive.c:1031 merge-recursive.c:1045
+#: merge-recursive.c:1034 merge-recursive.c:1048
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -859,7 +917,7 @@ msgstr ""
"КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ "
"е оÑтавена в дървото."
-#: merge-recursive.c:1037 merge-recursive.c:1050
+#: merge-recursive.c:1040 merge-recursive.c:1053
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -868,20 +926,20 @@ msgstr ""
"КОÐФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. ВерÑÐ¸Ñ %s на „%s“ "
"е оÑтавена в дървото: %s."
-#: merge-recursive.c:1091
+#: merge-recursive.c:1094
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1091
+#: merge-recursive.c:1094
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1147
+#: merge-recursive.c:1150
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð² „%s“, затова Ñе Ð´Ð¾Ð±Ð°Ð²Ñ ÐºÐ°Ñ‚Ð¾ „%s“"
-#: merge-recursive.c:1169
+#: merge-recursive.c:1172
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -890,150 +948,150 @@ msgstr ""
"КОÐФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1174
+#: merge-recursive.c:1177
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1228
+#: merge-recursive.c:1231
#, 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:1258
+#: merge-recursive.c:1261
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-#: merge-recursive.c:1457
+#: merge-recursive.c:1460
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"КОÐФЛИКТ (преименуване/добавÑне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1467
+#: merge-recursive.c:1470
#, c-format
msgid "Adding merged %s"
msgstr "ДобавÑне на ÑÐ»ÐµÑ‚Ð¸Ñ â€ž%s“"
-#: merge-recursive.c:1472 merge-recursive.c:1674
+#: merge-recursive.c:1475 merge-recursive.c:1677
#, c-format
msgid "Adding as %s instead"
msgstr "ДобавÑне като „%s“"
-#: merge-recursive.c:1523
+#: merge-recursive.c:1526
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да Ñе прочете"
-#: merge-recursive.c:1526
+#: merge-recursive.c:1529
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:1578
+#: merge-recursive.c:1581
msgid "modify"
msgstr "промÑна"
-#: merge-recursive.c:1578
+#: merge-recursive.c:1581
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:1588
+#: merge-recursive.c:1591
msgid "content"
msgstr "Ñъдържание"
-#: merge-recursive.c:1595
+#: merge-recursive.c:1598
msgid "add/add"
msgstr "добавÑне/добавÑне"
-#: merge-recursive.c:1629
+#: merge-recursive.c:1632
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "ПреÑкачане на „%s“ (ÑлетиÑÑ‚ резултат е идентичен ÑÑŠÑ ÑегашниÑ)"
-#: merge-recursive.c:1643
+#: merge-recursive.c:1646
#, c-format
msgid "Auto-merging %s"
msgstr "Ðвтоматично Ñливане на „%s“"
-#: merge-recursive.c:1647 git-submodule.sh:1025
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:1648
+#: merge-recursive.c:1651
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОÐФЛИКТ (%s): Конфликт при Ñливане на „%s“"
-#: merge-recursive.c:1734
+#: merge-recursive.c:1737
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:1759
+#: merge-recursive.c:1762
msgid "file/directory"
msgstr "файл/директориÑ"
-#: merge-recursive.c:1765
+#: merge-recursive.c:1768
msgid "directory/file"
msgstr "директориÑ/файл"
-#: merge-recursive.c:1770
+#: merge-recursive.c:1773
#, 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:1780
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "ДобавÑне на „%s“"
-#: merge-recursive.c:1797
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Фатална грешка при Ñливане, а такава не Ñ‚Ñ€Ñбва да възниква!"
-#: merge-recursive.c:1816
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуÑпешно Ñливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:1855
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
"ПътÑÑ‚ „%s“ не е обработен, това е грешка в Git, докладвайте Ñ Ð½Ð° "
"разработчиците, като пратите е-пиÑмо на адреÑ: „git@vger.kernel.org“."
-#: merge-recursive.c:1903
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:1916
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшеÑтвеник:"
msgstr[1] "открити Ñа %u общи предшеÑтвеници:"
-#: merge-recursive.c:1953
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "Ñливането не върна подаване"
-#: merge-recursive.c:2010
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "ÐеуÑпешен анализ на обекта „%s“"
-#: merge-recursive.c:2021 builtin/merge.c:645
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен"
@@ -1065,28 +1123,28 @@ msgstr "Зададена е лоша ÑтойноÑÑ‚ на променливаÑ
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "…"
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-ЧИСЛО"
@@ -1095,7 +1153,7 @@ msgstr "-ЧИСЛО"
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Ðе могат да Ñе дадат права за Ð·Ð°Ð¿Ð¸Ñ Ð² директориÑта „%s“ на групата"
@@ -1151,12 +1209,12 @@ msgstr "ПътÑÑ‚ „%s“ е в подмодула „%.*s“"
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магичеÑките пътища не Ñе поддържат от командата „%s“"
-#: pathspec.c:432
+#: pathspec.c:433
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътÑÑ‚ „%s“ е Ñлед Ñимволна връзка"
-#: pathspec.c:441
+#: pathspec.c:442
msgid ""
"There is nothing to exclude from by :(exclude) patterns.\n"
"Perhaps you forgot to add either ':/' or '.' ?"
@@ -1164,7 +1222,7 @@ msgstr ""
"Ðищо не Ñе изключва от шаблоните за изключване.\n"
"Това чеÑто Ñе Ñлучва, ако Ñте забравили да добавите „:/“ или „.“."
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "аргументът към опциÑта „--pretty“ не може да Ñе анализира"
@@ -1191,165 +1249,250 @@ msgstr ""
"„GIT_INDEX_VERSION“.\n"
"Ще Ñе ползва верÑÐ¸Ñ %i"
-#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
-#: builtin/merge.c:983
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запиÑ"
-#: refs/files-backend.c:2359
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "УказателÑÑ‚ „%s“ не може да бъде изтрит: %s"
-#: refs/files-backend.c:2362
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "Указателите не може да бъдат изтрити: %s"
-#: refs/files-backend.c:2371
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "УказателÑÑ‚ „%s“ не може да бъде изтрит"
-#: ref-filter.c:245
+#: ref-filter.c:55
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "грешка във форма̀та: лекÑемата %%(end) е използвана без Ñъответната Ñ"
+msgid "expected format: %%(color:<color>)"
+msgstr "очакван формат: %%(color:ЦВЯТ)"
+
+#: ref-filter.c:57
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "непознат цвÑÑ‚: %%(color:%s)"
-#: ref-filter.c:704
+#: ref-filter.c:71
+#, c-format
+msgid "unrecognized format: %%(%s)"
+msgstr "непознат формат: %%(%s)"
+
+#: ref-filter.c:77
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) не приема аргументи"
+
+#: ref-filter.c:84
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) не приема аргументи"
+
+#: ref-filter.c:101
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква Ñе положителна ÑтойноÑÑ‚ за „contents:lines=%s“"
-#: ref-filter.c:833
+#: ref-filter.c:103
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "очакван формат: %%(color:ЦВЯТ)"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:835
-msgid "unable to parse format"
-msgstr "форматът не може да бъде анализиран"
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "непознат аргумент за %%(objectname): %s"
-#: ref-filter.c:870
+#: ref-filter.c:135
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИÐÐ,ПОЗИЦИЯ)"
-#: ref-filter.c:893
+#: ref-filter.c:147
#, c-format
-msgid "improper format entered align:%s"
-msgstr "въведен е неправилен формат align:%s"
+msgid "unrecognized position:%s"
+msgstr "непозната позициÑ: %s"
-#: ref-filter.c:898
+#: ref-filter.c:151
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "непозната широчина: %s"
+
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "непознат аргумент за %%(align): %s"
+
+#: ref-filter.c:161
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква Ñе положителна широчина Ñ Ð»ÐµÐºÑемата „%%(align)“"
-#: ref-filter.c:1219
+#: ref-filter.c:244
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "неправилно име на обект: „%.*s“"
+
+#: ref-filter.c:270
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "непознато име на обект: „%.*s“"
+
+#: ref-filter.c:372
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "грешка във форма̀та: лекÑемата %%(end) е използвана без Ñъответната Ñ"
+
+#: ref-filter.c:424
+#, c-format
+msgid "malformed format string %s"
+msgstr "неправилен низ за форматиране „%s“"
+
+#: ref-filter.c:878
+msgid ":strip= requires a positive integer argument"
+msgstr "„:strip=“ изиÑква аргумент цÑло, положително чиÑло"
+
+#: ref-filter.c:883
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
+msgstr "указателÑÑ‚ „%s“ не разполага Ñ %ld компоненти за премахване (:strip)"
+
+#: ref-filter.c:1046
+#, c-format
+msgid "unknown %.*s format %s"
+msgstr "непознато „%.*s“, формат „%s“"
+
+#: ref-filter.c:1066 ref-filter.c:1097
+#, c-format
+msgid "missing object %s for %s"
+msgstr "обектът „%s“ липÑва за „%s“"
+
+#: ref-filter.c:1069 ref-filter.c:1100
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "неуÑпешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
+
+#: ref-filter.c:1311
#, c-format
msgid "malformed object at '%s'"
msgstr "обект ÑÑŠÑ Ñгрешен формат при „%s“"
-#: ref-filter.c:1561
+#: ref-filter.c:1373
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "игнориране на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ñ Ð³Ñ€ÐµÑˆÐ½Ð¾ име „%s“"
+
+#: ref-filter.c:1378
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнориране на Ð¿Ð¾Ð²Ñ€ÐµÐ´ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „%s“"
+
+#: ref-filter.c:1651
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липÑва лекÑемата %%(end)"
-#: ref-filter.c:1615
+#: ref-filter.c:1705
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: remote.c:756
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Ðевъзможно е да Ñе доÑтавÑÑ‚ едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:760
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено Ñледи „%s“, а не „%s“"
-#: remote.c:764
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ Ñледи както „%s“, така и „%s“"
-#: remote.c:772
+#: remote.c:762
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: remote.c:1687 remote.c:1730
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "УказателÑÑ‚ „HEAD“ не Ñочи към клон"
-#: remote.c:1696
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "нÑма клон на име „%s“"
-#: remote.c:1699
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1705
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е Ñъхранен като ÑледÑщ клон"
-#: remote.c:1720
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липÑва локален ÑледÑщ клон за меÑтоположението за изтлаÑкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1735
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "нÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¾Ð½ÑŠÑ‚ „%s“ да Ñледи нÑкой друг"
-#: remote.c:1746
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателÑÑ‚ за изтлаÑкване на „%s“ не включва „%s“"
-#: remote.c:1759
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателÑÑ‚ за изтлаÑкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1781
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "проÑтото (simple) изтлаÑкване не ÑъответÑтва на една цел"
-#: remote.c:2083
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон Ñледи „%s“, но ÑледениÑÑ‚ клон е изтрит.\n"
-#: remote.c:2087
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2090
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:2094
+#: remote.c:2085
#, 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:2100
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните Ñи промени чрез „git push“)\n"
-#: remote.c:2103
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1359,11 +1502,11 @@ msgstr[0] ""
msgstr[1] ""
"Клонът ви е Ñ %2$d Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð´ „%1$s“ и може да бъде тривиално ÑлÑÑ‚.\n"
-#: remote.c:2111
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñи клон чрез „git pull“)\n"
-#: remote.c:2114
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1378,28 +1521,28 @@ msgstr[1] ""
"ТекущиÑÑ‚ клон Ñе е отделил от „%s“,\n"
"двата имат Ñъответно по %d и %d неÑъвпадащи подаваниÑ.\n"
-#: remote.c:2124
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (Ñлейте Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ в Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ Ñ‡Ñ€ÐµÐ· „git pull“)\n"
-#: revision.c:2193
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "ТекущиÑÑ‚ клон е повреден"
-#: revision.c:2196
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ТекущиÑÑ‚ клон „%s“ е без Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ "
-#: revision.c:2390
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ Ñа неÑъвмеÑтими"
-#: run-command.c:90
+#: run-command.c:92
msgid "open /dev/null failed"
msgstr "неуÑпешно отварÑне на „/dev/null“"
-#: run-command.c:92
+#: run-command.c:94
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "неуÑпешно изпълнение на dup2(%d,%d)"
@@ -1425,7 +1568,7 @@ msgid "the receiving end does not support --atomic push"
msgstr "получаващата Ñтрана не поддържа изтлаÑкване Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--atomic“"
# FIXME git add <path…> for consistence
-#: sequencer.c:183
+#: sequencer.c:174
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -1433,7 +1576,7 @@ msgstr ""
"Ñлед коригирането на конфликтите, отбележете Ñъответните\n"
"пътища Ñ â€žgit add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:186
+#: sequencer.c:177
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -1444,227 +1587,227 @@ msgstr ""
"подайте резултата Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git commit'“."
# FIXME - must be the same as Could not write to '%s' above
-#: sequencer.c:199 sequencer.c:842 sequencer.c:922
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "„%s“ не може да бъде запиÑан"
-#: sequencer.c:202
+#: sequencer.c:193
#, c-format
msgid "Error wrapping up %s"
msgstr "Обработката на „%s“ не завърши уÑпешно."
-#: sequencer.c:217
+#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Локалните ви промени ще бъдат презапиÑани при отбирането на подаваниÑ."
-#: sequencer.c:219
+#: sequencer.c:210
msgid "Your local changes would be overwritten by revert."
msgstr "Локалните ви промени ще бъдат презапиÑани при отмÑната на подаваниÑ."
-#: sequencer.c:222
+#: sequencer.c:213
msgid "Commit your changes or stash them to proceed."
msgstr "Подайте или Ñкатайте промените, за да продължите"
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:309
+#: sequencer.c:300
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запазен"
-#: sequencer.c:327
+#: sequencer.c:318
msgid "Could not resolve HEAD commit\n"
msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито\n"
-#: sequencer.c:347
+#: sequencer.c:338
msgid "Unable to update cache tree\n"
msgstr "Дървото на кеша не може да бъде обновено\n"
-#: sequencer.c:399
+#: sequencer.c:390
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Подаването „%s“ не може да бъде анализирано\n"
-#: sequencer.c:404
+#: sequencer.c:395
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "РодителÑкото подаване „%s“ не може да бъде анализирано\n"
-#: sequencer.c:469
+#: sequencer.c:460
msgid "Your index file is unmerged."
msgstr "ИндекÑÑŠÑ‚ не е ÑлÑÑ‚."
-#: sequencer.c:488
+#: sequencer.c:479
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Подаването „%s“ е Ñливане, но не е дадена опциÑта „-m“"
-#: sequencer.c:496
+#: sequencer.c:487
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Подаването „%s“ нÑма родител %d"
-#: sequencer.c:500
+#: sequencer.c:491
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Указано е базово подаване, но подаването „%s“ не е Ñливане."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:513
+#: sequencer.c:504
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната ÑтойноÑÑ‚ за родителÑкото подаване „%s“"
-#: sequencer.c:517
+#: sequencer.c:508
#, c-format
msgid "Cannot get commit message for %s"
msgstr "ÐеуÑпешно извличане на Ñъобщението за подаване на „%s“"
-#: sequencer.c:603
+#: sequencer.c:594
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:604
+#: sequencer.c:595
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:639
+#: sequencer.c:630
msgid "empty commit set passed"
msgstr "зададено е празно множеÑтво от подаваниÑ"
-#: sequencer.c:647
+#: sequencer.c:638
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуÑпешно изчитане на индекÑа"
-#: sequencer.c:651
+#: sequencer.c:642
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуÑпешно обновÑване на индекÑа"
-#: sequencer.c:711
+#: sequencer.c:702
#, c-format
msgid "Cannot %s during a %s"
msgstr "По време на „%1$s“ не може да Ñе извърши „%2$s“"
-#: sequencer.c:733
+#: sequencer.c:724
#, c-format
msgid "Could not parse line %d."
msgstr "%d-ÑÑ‚ ред не може да Ñе анализира."
-#: sequencer.c:738
+#: sequencer.c:729
msgid "No commits parsed."
msgstr "Ðикое от подаваниÑта не може да Ñе разпознае."
# FIXME Could not open %s. - full stop for consistence with next message
-#: sequencer.c:750
+#: sequencer.c:741
#, c-format
msgid "Could not open %s"
msgstr "„%s“ не може да Ñе прочете."
-#: sequencer.c:754
+#: sequencer.c:745
#, c-format
msgid "Could not read %s."
msgstr "„%s“ не може да Ñе отвори."
-#: sequencer.c:761
+#: sequencer.c:752
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Файлът Ñ Ð¾Ð¿Ð¸Ñание на предÑтоÑщите дейÑÑ‚Ð²Ð¸Ñ â€” „%s“ не може да Ñе ползва"
-#: sequencer.c:791
+#: sequencer.c:782
#, c-format
msgid "Invalid key: %s"
msgstr "Ðеправилен ключ: „%s“"
-#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
+#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Ðеправилна ÑтойноÑÑ‚ за „%s“: „%s“"
-#: sequencer.c:804
+#: sequencer.c:795
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Ðеправилно Ñъдържание на файла Ñ Ð¾Ð¿Ñ†Ð¸Ð¸: „%s“"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "a cherry-pick or revert is already in progress"
msgstr ""
"в момента вече Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона"
-#: sequencer.c:824
+#: sequencer.c:815
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
-#: sequencer.c:828
+#: sequencer.c:819
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "ДиректориÑта за ÑеквенÑора „%s“ не може да бъде Ñъздадена"
-#: sequencer.c:844 sequencer.c:926
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Обработката на „%s“ не завърши уÑпешно."
-#: sequencer.c:863 sequencer.c:996
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона"
-#: sequencer.c:865
+#: sequencer.c:856
msgid "cannot resolve HEAD"
msgstr "Подаването Ñочено от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ не може да бъде открито"
-#: sequencer.c:867
+#: sequencer.c:858
msgid "cannot abort from a branch yet to be born"
msgstr ""
"дейÑтвието не може да бъде преуÑтановено, когато Ñте на клон, който тепърва "
"предÑтои да бъде Ñъздаден"
-#: sequencer.c:887 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "файлът „%s“ не може да бъде отворен: %s"
+msgid "cannot open %s"
+msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:890
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "файлът „%s“ не може да бъде прочетен: %s"
-#: sequencer.c:891
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:897
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазениÑÑ‚ преди започването на отбирането файл за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:919
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Файлът „%s“ не може да Ñе форматира по подходÑÑ‰Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½."
-#: sequencer.c:1064
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да Ñе отбере „%s“"
-#: sequencer.c:1067
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна верÑиÑ"
-#: sequencer.c:1101
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "Първоначалното подаване не може да бъде отменено"
-#: sequencer.c:1102
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "При празен връх не могат да Ñе отбират подаваниÑ"
@@ -1673,7 +1816,35 @@ msgstr "При празен връх не могат да Ñе отбират п
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sha1_name.c:463
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Очаква Ñе верÑÐ¸Ñ Ð½Ð° хранилището на git <= %d, а не %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "открити Ñа непознати Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ð² хранилището:"
+
+#: sha1_file.c:1080
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+"отмеÑтване преди ÐºÑ€Ð°Ñ Ð½Ð° Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» (възможно е индекÑÑŠÑ‚ да е повреден)"
+
+#: sha1_file.c:2458
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"отмеÑтване преди началото на индекÑа на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ (възможно е "
+"индекÑÑŠÑ‚ да е повреден)"
+
+#: sha1_file.c:2462
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"отмеÑтване преди ÐºÑ€Ð°Ñ Ð½Ð° индекÑа на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ (възможно е индекÑÑŠÑ‚ "
+"да е отрÑзан)"
+
+#: sha1_name.c:462
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"
@@ -1697,67 +1868,315 @@ msgstr ""
"Ñпрете това Ñъобщение като изпълните командата:\n"
"„git config advice.objectNameWarning false“"
-#: submodule.c:61 submodule.c:95
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"ÐеÑлетите файлове „.gitmodules“ не могат да бъдат променÑни. Първо "
"коригирайте конфликтите"
-#: submodule.c:65 submodule.c:99
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Във файла „.gitmodules“ липÑва раздел за Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€žpath=%s“"
-#: submodule.c:73
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "ЗапиÑÑŠÑ‚ „%s“ във файла „.gitmodules“ не може да бъде променен"
-#: submodule.c:106
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "ЗапиÑÑŠÑ‚ „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-#: submodule.c:117
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "неуÑпешно добавÑне на Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „.gitmodules“ в индекÑа"
-#: submodule.c:1040
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "ÐаÑтройката „submodule.fetchJobs“ не приема отрицателни ÑтойноÑти"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Ðеправилна ÑтойноÑÑ‚ за „%s“"
+
+#: trailer.c:237
#, c-format
-msgid "Could not set core.worktree in %s"
-msgstr "ÐаÑтройката „core.worktree“ не може да Ñе зададе в „%s“"
+msgid "running trailer command '%s' failed"
+msgstr "неуÑпешно изпълнение на завършващата команда „%s“"
-#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
-#: trailer.c:561
+#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
+#: trailer.c:562
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "неправилна ÑтойноÑÑ‚ „%s“ за наÑтройката „%s“"
-#: trailer.c:543 trailer.c:548 builtin/remote.c:296
+#: trailer.c:544 trailer.c:549 builtin/remote.c:289
#, c-format
msgid "more than one %s"
msgstr "ÑтойноÑтта „%s“ Ñе Ð¿Ð¾Ð²Ñ‚Ð°Ñ€Ñ Ð² наÑтройките"
-#: trailer.c:581
+#: trailer.c:582
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "празна завършваща лекÑема в епилога „%.*s“"
-#: trailer.c:701
+#: trailer.c:702
#, c-format
msgid "could not read input file '%s'"
msgstr "входниÑÑ‚ файл „%s“ не може да бъде прочетен"
-#: trailer.c:704
+#: trailer.c:705
msgid "could not read from stdin"
msgstr "от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ не може да Ñе чете"
-#: transport-helper.c:1025
+#: trailer.c:857 builtin/am.c:42
+#, c-format
+msgid "could not stat %s"
+msgstr "Ðе може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
+
+#: trailer.c:859
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "„%s“ не е обикновен файл"
+
+#: trailer.c:861
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "„%s“: нÑма права за запиÑване на файла"
+
+#: trailer.c:873
+msgid "could not open temporary file"
+msgstr "временниÑÑ‚ файл не може да Ñе отвори"
+
+#: trailer.c:912
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "временниÑÑ‚ файл не може да Ñе преименува на „%s“"
+
+#: transport-helper.c:1041
#, c-format
msgid "Could not read ref %s"
msgstr "УказателÑÑ‚ „%s“ не може да Ñе прочете."
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"ИзтеглÑнето ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или Ñкатайте промените, за да преминете към нов клон."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"ИзтеглÑнето ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или Ñкатайте промените, за да Ñлеете."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"„%s“ ще презапише локалните промени на тези файлове:\n"
+"%%sПодайте или Ñкатайте промените, за да извършите „%s“."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише локалните промени на тези файлове:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"ОбновÑването на тези директории ще изтрие неÑледените файлове в Ñ‚ÑÑ…:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"ИзтеглÑнето ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да преминете на друг клон."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"ИзтеглÑнето ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Сливането ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да Ñлеете."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"„%s“ ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да извършите „%s“."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще изтрие тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"ИзтеглÑнето ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да Ñмените клон."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"ИзтеглÑнето ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Сливането ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да Ñлеете."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Сливането ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"„%s“ ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%sПремеÑтете ги или ги изтрийте, за да извършите „%s“."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"„%s“ ще презапише тези неÑледени файлове в работното дърво:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "ЗапиÑÑŠÑ‚ за „%s“ Ñъвпада Ñ Ñ‚Ð¾Ð·Ð¸ за „%s“. Ðе може да Ñе приÑвои."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"ЧаÑтичното изтеглÑне не може да бъде обновено: Ñледните запиÑи не Ñа "
+"актуални:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"ОбновÑването на чаÑтичното изтеглÑне ще презапише тези файлове в работното "
+"дърво:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"ОбновÑването на чаÑтичното изтеглÑне ще изтрие тези файлове в работното "
+"дърво:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "ПреуÑтановÑване на дейÑтвието\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "ИзтеглÑне на файлове"
@@ -1790,210 +2209,206 @@ msgstr "неправилен номер на порт"
msgid "invalid '..' path segment"
msgstr "неправилна чаÑÑ‚ от Ð¿ÑŠÑ‚Ñ â€ž..“"
-#: wrapper.c:219 wrapper.c:362
+#: wrapper.c:222 wrapper.c:381
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "„%s“ не може да бъде отворен и за четене, и за запиÑ"
-#: wrapper.c:221 wrapper.c:364
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запиÑ"
-#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
-#: builtin/merge.c:1074 builtin/pull.c:380
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: wrapper.c:579
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "нÑма доÑтъп до „%s“: %s"
-
-#: wrapper.c:600
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "нÑма доÑтъп до „%s“"
-#: wrapper.c:608
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ðµ недоÑтъпна"
-#: wrapper.c:635
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "„%s“ не може да бъде отворен за запиÑ"
# FIXME - must be the same as Could not write to '%s' above
-#: wrapper.c:646 builtin/am.c:425
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "„%s“ не може да бъде запиÑан"
-#: wrapper.c:652
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "„%s“ не може да Ñе затвори"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "ÐеÑлети пътища:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (използвайте „git reset %s ФÐЙЛ…“, за да извадите ФÐЙЛа от индекÑа)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (използвайте „git rm --cached %s ФÐЙЛ…“, за да извадите ФÐЙЛа от индекÑа)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git add ФÐЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (използвайте „git add/rm ФÐЙЛ…“, Ñпоред решението, което избирате за "
"конфликта)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git rm ФÐЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "Промени, които не Ñа в индекÑа за подаване:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add ФÐЙЛ…“, за да обновите Ñъдържанието за подаване)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add/rm ФÐЙЛ…“, за да обновите Ñъдържанието за подаване)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (използвайте „git checkout -- ФÐЙЛ…“, за да отхвърлите промените в "
"работното дърво)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (подайте или отхвърлете неÑледеното или промененото Ñъдържание в "
"подмодулите)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (използвайте „git %s ФÐЙЛ…“, за да определите какво включвате в подаването)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "изтрити в двата ÑлучаÑ:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "добавени от ваÑ:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "изтрити от Ñ‚ÑÑ…:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "добавени от Ñ‚ÑÑ…:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "изтрити от ваÑ:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "добавени и в двата ÑлучаÑ:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "променени и в двата ÑлучаÑ:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "грешка: ÑÑŠÑтоÑнието на промÑната „%x“ не може да бъде обработено"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "нов файл:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "копиран:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "изтрит:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "променен:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "преименуван:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "ÑмÑна на вида:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "непозната промÑна:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "неÑлÑÑ‚:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "нови подаваниÑ, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "променено Ñъдържание, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "неÑледено Ñъдържание, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "грешка: ÑÑŠÑтоÑнието на промÑната „%c“ не може да бъде обработено"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Подмодулите Ñа променени, но не Ñа обновени:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2001,39 +2416,39 @@ msgstr ""
"Ðе променÑйте Ð³Ð¾Ñ€Ð½Ð¸Ñ Ñ€ÐµÐ´.\n"
"Ð’Ñичко отдолу ще бъде изтрито."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "ÐÑкои пътища не Ñа Ñлети."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Ð’Ñички конфликти Ñа решени, но продължавате Ñливането."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите Ñливането)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуÑнете тази кръпка)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възÑтановите Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½)"
@@ -2187,43 +2602,43 @@ msgstr ""
" (използвайте „git bisect reset“, за да Ñе върнете към първоначалното "
"ÑÑŠÑтоÑние и клон)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "Ðа клон "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е при "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Извън вÑички клони."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "ÐеÑледени файлове"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2235,32 +2650,32 @@ msgstr ""
"изпълнението, но не Ñ‚Ñ€Ñбва да забравÑте ръчно да добавÑте новите файлове.\n"
"За повече подробноÑти погледнете „git status help“."
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "ÐеÑледените файлове не Ñа изведени%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опциÑта „-u“, за да изведете неÑледените файлове)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "ÐÑма промени"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекÑа за подаване не Ñа добавени промени\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2269,52 +2684,56 @@ msgstr ""
"към индекÑа за подаване не Ñа добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне Ñ‚Ñхното Ñледене)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекÑа за подаване не Ñа добавени промени, но има нови файлове\n"
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липÑват каквито и да е промени (Ñъздайте или копирайте файлове и използвайте "
"„git add“, за да започне Ñ‚Ñхното Ñледене)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "липÑват каквито и да е промени\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липÑват каквито и да е промени (използвайте опциÑта „-u“, за да Ñе изведат и "
"неÑледените файлове)\n"
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "липÑват каквито и да е промени, работното дърво е чиÑто\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Първоначално подаване на клон"
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "изтрит"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "назад Ñ "
-#: compat/precompose_utf8.c:56 builtin/clone.c:408
+#: wt-status.c:1702 wt-status.c:1705
+msgid "ahead "
+msgstr "напред Ñ "
+
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуÑпешно изтриване на „%s“"
@@ -2328,7 +2747,7 @@ msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "неуÑпешно обновÑване на файловете"
@@ -2341,7 +2760,7 @@ msgstr "изтриване на „%s“\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и Ñлед обновÑването на индекÑа не Ñа добавени към него:"
-#: builtin/add.c:194 builtin/rev-parse.c:796
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен"
@@ -2377,15 +2796,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани Ñпоред нÑкой от файловете „.gitignore“:\n"
-#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
-#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "пробно изпълнeние"
-#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "повече подробноÑти"
@@ -2393,7 +2812,7 @@ msgstr "повече подробноÑти"
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
@@ -2465,138 +2884,123 @@ msgstr "Ðищо не е зададено и нищо не е добавено.\
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "ВероÑтно иÑкахте да използвате „git add .“?\n"
-#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
-#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:40
+#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "файлът Ñ Ð¸Ð½Ð´ÐµÐºÑа е повреден"
-#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан"
-#: builtin/am.c:42
-#, c-format
-msgid "could not stat %s"
-msgstr "Ðе може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
-
-#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/am.c:445
+#: builtin/am.c:430
msgid "could not parse author script"
msgstr "Ñкриптът за автор не може да Ñе анализира"
-#: builtin/am.c:522
+#: builtin/am.c:507
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:563 builtin/notes.c:300
+#: builtin/am.c:548 builtin/notes.c:300
#, c-format
msgid "Malformed input line: '%s'."
msgstr "ДадениÑÑ‚ входен ред е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ формат: „%s“."
-#: builtin/am.c:600 builtin/notes.c:315
+#: builtin/am.c:585 builtin/notes.c:315
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да Ñе копира от „%s“ към „%s“"
-#: builtin/am.c:626
+#: builtin/am.c:611
msgid "fseek failed"
msgstr "неуÑпешно изпълнение на „fseek“"
-#: builtin/am.c:787 builtin/am.c:875
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "„%s“ не може да бъде отворен за четене: %s"
-
-#: builtin/am.c:794
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "„%s“ не може да бъде отворен за запиÑ: %s"
-
-#: builtin/am.c:803
+#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да Ñе анализира"
-#: builtin/am.c:868
+#: builtin/am.c:853
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една ÑÐµÑ€Ð¸Ñ ÐºÑ€ÑŠÐ¿ÐºÐ¸ от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:916
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "неправилна ÑтойноÑÑ‚ за време"
-#: builtin/am.c:919 builtin/am.c:927
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:924
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "неправилно отмеÑтване на чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ"
-#: builtin/am.c:1011
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:1016 builtin/clone.c:373
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/am.c:1020
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Кръпките не могат да бъдат разделени."
-#: builtin/am.c:1152 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан"
-#: builtin/am.c:1203
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "След коригирането на този проблем изпълнете „%s --continue“."
-#: builtin/am.c:1204
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Ðко предпочитате да преÑкочите тази кръпка, изпълнете „%s --skip“."
-#: builtin/am.c:1205
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "За да Ñе върнете към първоначалното ÑÑŠÑтоÑние, изпълнете „%s --abort“."
-#: builtin/am.c:1343
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Празна кръпка. Дали не е разделена погрешно?"
-#: builtin/am.c:1417 builtin/log.c:1347
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичноÑÑ‚: %s"
-#: builtin/am.c:1444
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: builtin/am.c:1646
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Ð’ хранилището липÑват необходимите обекти BLOB, за да Ñе премине към тройно "
"Ñливане."
-#: builtin/am.c:1648
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво Ñе реконÑтруира от информациÑта в индекÑа…"
-#: builtin/am.c:1667
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2604,39 +3008,39 @@ msgstr ""
"Кръпката не може да Ñе приложи към обектите BLOB в индекÑа.\n"
"Да не би да Ñте Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð»Ð¸ на ръка?"
-#: builtin/am.c:1673
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно Ñливане…"
-#: builtin/am.c:1688
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "ÐеуÑпешно Ñливане на промените."
-#: builtin/am.c:1712 builtin/merge.c:632
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не уÑÐ¿Ñ Ð´Ð° запише обект-дърво"
-#: builtin/am.c:1719
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "прилагане върху празна иÑториÑ"
-#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
-#: builtin/merge.c:854
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде запиÑан"
-#: builtin/am.c:1764 builtin/am.c:1768
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да Ñе продължи — „%s“ не ÑъщеÑтвува."
-#: builtin/am.c:1784
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"За интерактивно изпълнение е необходимо ÑтандартниÑÑ‚\n"
"изход да е Ñвързан Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð», а в момента не е."
-#: builtin/am.c:1789
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "ТÑлото на кръпката за прилагане е:"
@@ -2644,38 +3048,38 @@ msgstr "ТÑлото на кръпката за прилагане е:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1799
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на вÑичко:"
-#: builtin/am.c:1849
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"ИндекÑÑŠÑ‚ не е чиÑÑ‚: кръпките не могат да бъдат приложени (замърÑени Ñа: %s)"
-#: builtin/am.c:1884 builtin/am.c:1955
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1900
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1908
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "ÐеуÑпешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1914
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Дубликат на проблемната кръпка Ñе намира в: %s"
-#: builtin/am.c:1958
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2685,7 +3089,7 @@ msgstr ""
"Ðко нÑма друга промÑна за включване в индекÑа, най-вероÑтно нÑÐºÐ¾Ñ Ð´Ñ€ÑƒÐ³Ð°\n"
"кръпка е довела до Ñъщите промени и в такъв Ñлучай проÑто пропуÑнете тази."
-#: builtin/am.c:1965
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2693,17 +3097,17 @@ msgstr ""
"ИндекÑÑŠÑ‚ вÑе още Ñъдържа неÑлети промени.\n"
"Възможно е да не Ñте изпълнили „git add“."
-#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2125
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "индекÑÑŠÑ‚ не може да бъде изчиÑтен"
-#: builtin/am.c:2159
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2714,157 +3118,159 @@ msgstr ""
"към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2220
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ðеправилна ÑтойноÑÑ‚ за „--patch-format“: „%s“"
-#: builtin/am.c:2253
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [ФÐЙЛ_С_ПОЩÐ|ДИРЕКТОРИЯ_С_ПОЩÐ]…"
-#: builtin/am.c:2254
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2260
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2262
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "изоÑтавена опциÑ, ÑъщеÑтвува по иÑторичеÑки причини, нищо не прави"
-#: builtin/am.c:2264
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "да Ñе преминава към тройно Ñливане при нужда."
-#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "без извеждане на информациÑ"
-#: builtin/am.c:2267
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "добавÑне на ред за Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€žSigned-off-by“ в Ñъобщението за подаване"
-#: builtin/am.c:2270
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (Ñтандартно)"
-#: builtin/am.c:2272
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опциÑта „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2274
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опциÑта „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2276
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опциÑта „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2278
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опциÑта „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2281
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опциÑта „--keep-cr“ на командата „git-mailsplit“ незавиÑимо "
"от „am.keepcr“"
-#: builtin/am.c:2284
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "пропуÑкане на вÑичко преди реда за отрÑзване"
-#: builtin/am.c:2285 builtin/apply.c:4554
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "дейÑтвие"
-#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
-#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
-#: builtin/am.c:2313
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2294 builtin/apply.c:4578
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ"
-#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
-#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
-#: builtin/pull.c:167 builtin/submodule--helper.c:78
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "път"
-#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2306 builtin/apply.c:4522
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "БРОЙ"
-#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "ФОРМÐТ"
-#: builtin/am.c:2310
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2316
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "избрано от Ð²Ð°Ñ Ñъобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2318
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки Ñлед коригирането на конфликт"
-#: builtin/am.c:2321
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "Ñиноними на „--continue“"
-#: builtin/am.c:2324
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "преÑкачане на текущата кръпка"
-#: builtin/am.c:2327
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr ""
"възÑтановÑване на първоначалното ÑÑŠÑтоÑние на клона и преуÑтановÑване на "
"прилагането на кръпката."
-#: builtin/am.c:2331
+#: builtin/am.c:2316
msgid "lie about committer date"
-msgstr "дата за подаване различна от първоначалнота"
+msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2333
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ"
-#: builtin/am.c:2336
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "подпиÑване на подаваниÑта Ñ GPG"
-#: builtin/am.c:2339
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(ползва Ñе вътрешно за „git-rebase“)"
-#: builtin/am.c:2354
+#: builtin/am.c:2339
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."
@@ -2872,18 +3278,18 @@ msgstr ""
"Опциите „-b“/„--binary“ отдавна не правÑÑ‚ нищо и\n"
"ще бъдат премахнати в бъдеще. Ðе ги ползвайте."
-#: builtin/am.c:2361
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "неуÑпешно изчитане на индекÑа"
-#: builtin/am.c:2376
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° пребазиране „%s“ вÑе още ÑъщеÑтвува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2400
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2892,7 +3298,7 @@ msgstr ""
"Открита е излишна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž%s“.\n"
"Можете да Ñ Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git am --abort“."
-#: builtin/am.c:2406
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Ð’ момента не тече Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ коригиране и нÑма как да Ñе продължи."
@@ -2925,45 +3331,45 @@ msgstr "РегулÑрниÑÑ‚ израз върна %d при подадена
msgid "unable to find filename in patch at line %d"
msgstr "ЛипÑва име на файл на ред %d от кръпката"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d Ñе очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на Ñтар файл"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d Ñе очакваше „/dev/"
"null“"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброÑване бе получен неочакван ред: „%.*s“"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "чаÑÑ‚ от кръпка без заглавна чаÑÑ‚ на ред %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2978,65 +3384,65 @@ msgstr[1] ""
"След Ñъкращаването на първите %d чаÑти от компонентите на пътÑ, в заглавната "
"чаÑÑ‚ на „git diff“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° име на файл (ред: %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "новиÑÑ‚ файл завиÑи от Ñтарото Ñъдържание на файла"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "изтритиÑÑ‚ файл не е празен"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "новиÑÑ‚ файл „%s“ завиÑи от Ñтарото Ñъдържание на файла"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритиÑÑ‚ файл „%s“ не е празен"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "◠предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е Ñ Ð¸Ð·Ñ†Ñло повредени данни на ред %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "Ñимволната връзка „%s“ не може да бъде прочетена"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -3045,13 +3451,13 @@ msgstr[0] ""
msgstr[1] ""
"%d-то парче код бе уÑпешно приложено на ред %d (отмеÑтване от %d реда)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"КонтекÑÑ‚ÑŠÑ‚ е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3060,328 +3466,338 @@ msgstr ""
"при Ñ‚ÑŠÑ€Ñене за:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липÑват данните за двоичната кръпка за „%s“"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше Ñе SHA1: "
"„%s“, а бе получено: „%s“)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуÑпешно прилагане на кръпка: „%s:%ld“"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да Ñе изтегли"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "неуÑпешно прочитане на „%s“"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ Ñлед проÑледÑване на Ñимволна връзка"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът Ñ Ð¿ÑŠÑ‚ „%s“ е преименуван или изтрит"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не ÑъщеÑтвува в индекÑа"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "„%s“: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не ÑъответÑтва на индекÑа"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оÑÑ‚Ð°Ð²Ñ Ñ„Ð°Ð¹Ð»Ð° непразен"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а Ñе очакваше „%o“"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече ÑъщеÑтвува в индекÑа"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече ÑъщеÑтвува в работното дърво"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за доÑтъп (%o) на „%s“ не Ñъвпадат ÑÑŠÑ Ñтарите (%o) на „%s“"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "заÑегнатиÑÑ‚ файл „%s“ е Ñлед Ñимволна връзка"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "ПроверÑване на кръпката „%s“…"
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуÑпешно Ñъздаване на Ð·Ð°Ð¿Ð¸Ñ Ð² кеша чрез „make_cache_entry“ за „%s“"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да Ñе извади от индекÑа"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да Ñе за Ñъздаде мÑÑтото за Ñъхранение на новоÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да Ñе добави Ð·Ð°Ð¿Ð¸Ñ Ð² кеша за „%s“"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "затварÑне на файла „%s“"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да Ñе запише Ñ Ñ€ÐµÐ¶Ð¸Ð¼ на доÑтъп „%o“"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чиÑто."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "вътрешна грешка"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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 отхвърлени парчета…"
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Ñъкращаване на името на файла Ñ Ð¾Ñ‚Ñ…Ð²ÑŠÑ€Ð»ÐµÐ½Ð¸Ñ‚Ðµ парчета на „ %.*s.rej“"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "файлът „%s“ не може да бъде отворен: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе уÑпешно приложено."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "ПропуÑната кръпка: „%s“"
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "непознат вход"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан"
-#: builtin/apply.c:4517
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚"
-#: builtin/apply.c:4520
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "прилагане на промените напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŠÑ‚"
-#: builtin/apply.c:4523
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на ÑтатиÑтика на промените без прилагане на кръпката"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на Ð±Ñ€Ð¾Ñ Ð½Ð° добавените и изтритите редове"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на ÑтатиÑтика на входните данни без прилагане на кръпката"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да Ñе приложи, без дейÑтвително прилагане"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ"
-#: builtin/apply.c:4540
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промÑна на работното дърво"
-#: builtin/apply.c:4542
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, коÑто Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸ файлове извън работното дърво"
-#: builtin/apply.c:4544
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. ОпциÑта Ñе комбинира Ñ â€ž--check“/„--stat“/„--"
"summary“"
-#: builtin/apply.c:4546
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване Ñ Ñ‚Ñ€Ð¾Ð¹Ð½Ð¾ Ñливане, ако кръпката не може да Ñе приложи директно"
-#: builtin/apply.c:4548
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr ""
"Ñъздаване на временен Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база на включената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° индекÑа"
-#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "разделÑне на пътищата Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/apply.c:4553
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "да Ñе оÑигури контекÑÑ‚ от поне такъв БРОЙ Ñъвпадащи редове"
-#: builtin/apply.c:4555
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "заÑичане на нови или променени редове Ñ Ð³Ñ€ÐµÑˆÐºÐ¸ в знаците за интервали"
-#: builtin/apply.c:4558 builtin/apply.c:4561
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекÑта"
-#: builtin/apply.c:4564
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна поÑока"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "без изиÑкване на дори и един ред контекÑÑ‚"
-#: builtin/apply.c:4568
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оÑтавÑне на отхвърлените парчета във файлове Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ „.rej“"
-#: builtin/apply.c:4570
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "позволÑване на заÑтъпващи Ñе парчета"
-#: builtin/apply.c:4573
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липÑващ знак за нов ред в ÐºÑ€Ð°Ñ Ð½Ð° файл"
-#: builtin/apply.c:4576
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверÑване на номерата на редовете в заглавните чаÑти на парчетата"
-#: builtin/apply.c:4579
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "добавÑне на тази ÐÐЧÐЛÐÐ_ДИРЕКТОРИЯ към имената на вÑички файлове"
-#: builtin/apply.c:4601
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: builtin/apply.c:4609
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: builtin/apply.c:4612
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: builtin/apply.c:4631
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "кръпката „%s“ не може да бъде отворена"
-#: builtin/apply.c:4645
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати Ñа %d грешки в знаците за интервали"
-#: builtin/apply.c:4651 builtin/apply.c:4661
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3436,120 +3852,128 @@ msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"обновÑване на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žBISECT_HEAD“ вмеÑто да Ñе използва текущото подаване"
-#: builtin/blame.c:32
+#: builtin/blame.c:33
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ_ВЕРСИЯТÐ…] [ВЕРСИЯ] [--] ФÐЙЛ"
-#: builtin/blame.c:37
+#: builtin/blame.c:38
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗÐ_ВЕРСИЯТРÑа документирани в ръководÑтвото git-rev-list(1)"
-#: builtin/blame.c:2519
+#: builtin/blame.c:1782
+msgid "Blaming lines"
+msgstr "Ðнотирани редове"
+
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "Извеждане на анотациите Ñ Ð½Ð°Ð¼Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ им, поÑледователно"
# FIXME SHA-1 -> SHA1
-#: builtin/blame.c:2520
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Извеждане на празни Ñуми по SHA1 за граничните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (Ñтандартно опциÑта "
"е изключена)"
-#: builtin/blame.c:2521
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ðачалните Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð´Ð° не Ñе Ñчитат за гранични (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2522
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Извеждане на ÑтатиÑтика за извършените дейÑтвиÑ"
-#: builtin/blame.c:2523
+#: builtin/blame.c:2535
+msgid "Force progress reporting"
+msgstr "Принудително извеждане на напредъка"
+
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Извеждане на допълнителна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° определÑнето на анотациите"
-#: builtin/blame.c:2524
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr ""
"Извеждане на първоначалното име на файл (Ñтандартно това е автоматично)"
-#: builtin/blame.c:2525
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr ""
"Извеждане на първоначалниÑÑ‚ номер на ред (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2526
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:2527
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Извеждане във формат за команди от потребителÑко ниво Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° вÑеки "
"ред"
-#: builtin/blame.c:2528
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Използване на ÑÑŠÑ‰Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ като „git-annotate“ (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2529
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Извеждане на неформатирани времена (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Извеждане на пълните Ñуми по SHA1 (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Без име на автор и време на промÑна (Ñтандартно опциÑта е изключена)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Извеждане на е-пощата на автора, а не името му (Ñтандартно опциÑта е "
"изключена)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "Допълнителни изчиÑÐ»ÐµÐ½Ð¸Ñ Ð·Ð° по-добри резултати"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Изчитане на верÑиите от ФÐЙЛ, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "Използване на Ñъдържанието на ФÐЙЛа като крайно положение"
-#: builtin/blame.c:2537 builtin/blame.c:2538
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "напаÑване на редовете"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr ""
"ТърÑене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr ""
"ТърÑене на премеÑтени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñамо за редовете в интервала от n до m включително. Броенето "
@@ -3561,31 +3985,31 @@ msgstr ""
#. 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:2620
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 меÑеца"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [ОПЦИЯ…] [-l] [-f] ИМЕ_ÐÐ_КЛОР[ÐÐЧÐЛО]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [ОПЦИЯ…] [-r] (-d | -D) ИМЕ_ÐÐ_КЛОÐ…"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТÐР_КЛОÐ] ÐОВ_КЛОÐ"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3594,7 +4018,7 @@ msgstr ""
"изтриване на клона „%s“, който е ÑлÑÑ‚ към „%s“,\n"
" но още не е ÑлÑÑ‚ към върха „HEAD“."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3603,12 +4027,12 @@ msgstr ""
"отказване на изтриване на клона „%s“, който не е ÑлÑÑ‚ към\n"
" „%s“, но е ÑлÑÑ‚ към върха „HEAD“."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3617,301 +4041,322 @@ msgstr ""
"Клонът „%s“ не е ÑлÑÑ‚ напълно. Ðко Ñте Ñигурни, че иÑкате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "ÐеуÑпешно обновÑване на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "ОпциÑта „-a“ е неÑъвмеÑтима Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-d“"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, Ñочен от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“, не може да бъде открит"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Ðе можете да изтриете Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Ðе можете да изтриете клона „%s“, който е изтеглен в Ð¿ÑŠÑ‚Ñ â€ž%s“"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "ÑледÑщиÑÑ‚ клон „%s“ не може да бъде открит."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на ÑледÑÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит ÑледÑщ клон „%s“ (той Ñочеше към „%s“).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той Ñочеше към „%s“).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: изтрит]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: назад Ñ %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[назад Ñ %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: напред Ñ %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[напред Ñ %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: напред Ñ %d, назад Ñ %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[напред Ñ %d, назад Ñ %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " â—â—◠неправилен указател â—â—â—"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично Ñ‚ÑŠÑ€Ñене от „%s“)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(УказателÑÑ‚ „HEAD“ не е Ñвързан и е при „%s“)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "УказателÑÑ‚ „HEAD“ не е Ñвързан и е отделѐн от „%s“"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(извън клон)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Клонът „%s“ Ñе пребазира върху „%s“"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "ТърÑи Ñе двоично в клона „%s“ при „%s“"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½, защото Ñте извън който и да е клон"
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ðеправилно име на клон: „%s“"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "ÐеуÑпешно преименуване на клон"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Ðа клона Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ име „%s“ е дадено Ñлужебно име"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателÑÑ‚ „HEAD“ не е обновен"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационниÑÑ‚ файл не е обновен"
-#: builtin/branch.c:587
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "шаблонът за опиÑание на клон не бе запиÑан: „%s“"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "шаблонът за опиÑание на клон не бе запиÑан"
-#: builtin/branch.c:616
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Общи наÑтройки"
-#: builtin/branch.c:618
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на хеша и темата. ПовтарÑнето на опциÑта Ð¿Ñ€Ð¸Ð±Ð°Ð²Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ‚Ðµ клони"
-#: builtin/branch.c:619
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "без информационни ÑъобщениÑ"
-#: builtin/branch.c:620
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на Ñледене (виж git-pull(1))"
-#: builtin/branch.c:622
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "ÑмÑна на ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/branch.c:626
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "клон-източник"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "ÑмÑна на клона-източник"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:627
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "дейÑтвие върху ÑледÑщите клони"
-#: builtin/branch.c:629 builtin/branch.c:630
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
-msgstr "извеждане Ñамо на клоните, които Ñъдържат това подаване"
+msgstr "извеждане Ñамо на клоните, които Ñъдържат това ПОДÐÐ’ÐÐЕ"
-#: builtin/branch.c:633
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Специални дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° „git-branch“:"
-#: builtin/branch.c:634
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на ÑледÑщите, така и на локалните клони"
-#: builtin/branch.c:636
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "изтриване на клони, които Ñа напълно Ñлети"
-#: builtin/branch.c:637
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не Ñа напълно Ñлети"
-#: builtin/branch.c:638
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr ""
"премеÑтване/преименуване на клон и принадлежащиÑÑ‚ му журнал на указателите"
-#: builtin/branch.c:639
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "премеÑтване/преименуване на клон, дори ако има вече клон Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име"
-#: builtin/branch.c:640
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:641
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "Ñъздаване на журнала на указателите на клона"
-#: builtin/branch.c:643
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "редактиране на опиÑанието на клона"
-#: builtin/branch.c:644
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "принудително Ñъздаване, премеÑтване, преименуване, изтриване"
-#: builtin/branch.c:645
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "извеждане Ñамо на Ñлетите клони"
-#: builtin/branch.c:646
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "извеждане Ñамо на неÑлетите клони"
-#: builtin/branch.c:647
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
-msgstr "ключ"
+msgstr "КЛЮЧ"
-#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
-#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
-#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
-msgstr "обект"
+msgstr "ОБЕКТ"
-#: builtin/branch.c:652
+#: builtin/branch.c:687
msgid "print only branches of the object"
-msgstr "извеждане Ñамо на клоните на обекта"
+msgstr "извеждане Ñамо на клоните на ОБЕКТÐ"
-#: builtin/branch.c:670
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Ðе може да Ñе открие към какво Ñочи указателÑÑ‚ „HEAD“"
-#: builtin/branch.c:674 builtin/clone.c:697
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "Ð’ директориÑта „refs/heads“ липÑва файл „HEAD“"
-#: builtin/branch.c:694
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ Ñа неÑъвмеÑтими"
-#: builtin/branch.c:705 builtin/branch.c:747
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "Ðеобходимо е име на клон"
-#: builtin/branch.c:723
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "Ðе може да зададете опиÑание на „HEAD“ извън клон"
-#: builtin/branch.c:728
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "Ðе може да редактирате опиÑанието на повече от един клон едновременно"
-#: builtin/branch.c:735
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Ð’ клона „%s“ вÑе още нÑма подаваниÑ."
-#: builtin/branch.c:738
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "ЛипÑва клон на име „%s“."
-#: builtin/branch.c:753
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "Прекалено много клони за преименуване"
-#: builtin/branch.c:758
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "Зададени Ñа прекалено много клони за Ñледене"
-#: builtin/branch.c:762
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3919,39 +4364,39 @@ msgstr ""
"Следеното от „HEAD“ не може да Ñе зададе да е „%s“, защото то не Ñочи към "
"никой клон."
-#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "ÐÑма клон на име „%s“."
-#: builtin/branch.c:769
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "Ðе ÑъщеÑтвува клон на име „%s“."
-#: builtin/branch.c:781
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "Прекалено много клони за махане на Ñледене"
-#: builtin/branch.c:785
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не Ñочи към никой клон."
-#: builtin/branch.c:791
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "ÐÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ»Ð¾Ð½ÑŠÑ‚ „%s“ да Ñледи нÑкой друг"
-#: builtin/branch.c:805
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "ÐÑма никакъв ÑмиÑъл ръчно да Ñъздавате „HEAD“."
-#: builtin/branch.c:811
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "Опциите „-a“ и „-r“ на „git branch“ Ñа неÑъвмеÑтими Ñ Ð¸Ð¼Ðµ на клон"
-#: builtin/branch.c:814
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3960,7 +4405,7 @@ msgstr ""
"ОпциÑта „--set-upstream“ вече е оÑтарÑла и предÑтои да бъде махната. "
"Използвайте „--track“ или „--set-upstream-to“\n"
-#: builtin/branch.c:831
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3971,16 +4416,6 @@ msgstr ""
"За да накарате „%s“ да Ñледи „%s“, изпълнете Ñледната команда:\n"
"\n"
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:833
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4077,7 +4512,7 @@ msgstr "извеждане на вÑички атрибути, зададени
msgid "use .gitattributes only from the index"
msgstr "използване на файла „.gitattributes“ Ñамо от индекÑа"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
msgid "read file names from stdin"
msgstr "изчитане на имената на файловете от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
@@ -4085,7 +4520,7 @@ msgstr "изчитане на имената на файловете от Ñта
msgid "terminate input and output records by a NUL character"
msgstr "разделÑне на входните и изходните запиÑи Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -4138,49 +4573,54 @@ msgstr "контактът не може да бъде анализиран: %s"
msgid "no contacts specified"
msgstr "не Ñа указани контакти"
-#: builtin/checkout-index.c:126
+#: builtin/checkout-index.c:127
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [ОПЦИЯ…] [--] [ФÐЙЛ…]"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:144
+msgid "stage should be between 1 and 3 or all"
+msgstr "етапът Ñ‚Ñ€Ñбва да е „1“, „2“, „3“ или „all“ (вÑички)"
+
+#: builtin/checkout-index.c:160
msgid "check out all files in the index"
msgstr "изтеглÑне на вÑички файлове в индекÑа"
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:161
msgid "force overwrite of existing files"
msgstr "презапиÑване на файловете, дори и да ÑъщеÑтвуват"
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:163
msgid "no warning for existing files and files not in index"
msgstr "без Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ липÑващи файлове и файлове не в индекÑа"
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:165
msgid "don't checkout new files"
msgstr "без изтеглÑне на нови файлове"
-#: builtin/checkout-index.c:195
+#: builtin/checkout-index.c:167
msgid "update stat information in the index file"
msgstr "обновÑване на информациÑта получена чрез „stat“ за файловете в индекÑа"
-#: builtin/checkout-index.c:201
+#: builtin/checkout-index.c:171
msgid "read list of paths from the standard input"
msgstr "изчитане на пътищата от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:173
msgid "write the content to temporary files"
msgstr "запиÑване на Ñъдържанието във временни файлове"
-#: builtin/checkout-index.c:204 builtin/column.c:30
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
-#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
+#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "ÐИЗ"
-#: builtin/checkout-index.c:205
+#: builtin/checkout-index.c:175
msgid "when creating files, prepend <string>"
msgstr "при Ñъздаването на нови файлове да Ñе Ð´Ð¾Ð±Ð°Ð²Ñ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑа ÐИЗ"
-#: builtin/checkout-index.c:208
+#: builtin/checkout-index.c:177
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това ÑÑŠÑтоÑние на Ñливане"
@@ -4222,45 +4662,49 @@ msgstr "пътÑÑ‚ „%s“ не може да бъде ÑлÑн"
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде ÑлÑн"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "ОпциÑта „%s“ е неÑъвмеÑтима Ñ Ð¾Ð±Ð½Ð¾Ð²Ñването на пътища"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "ОпциÑта „%s“ е неÑъвмеÑтима Ñ â€ž%s“"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Ðевъзможно е едновременно да обновÑвате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "повреден файл на индекÑа"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътÑÑ‚ „%s“ не е ÑлÑÑ‚"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "първо Ñ‚Ñ€Ñбва да коригирате индекÑа Ñи"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да Ñе проÑледи: %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "УказателÑÑ‚ „HEAD“ в момента Ñочи към"
+#: builtin/checkout.c:664 builtin/clone.c:661
+msgid "unable to update HEAD"
+msgstr "УказателÑÑ‚ „HEAD“ не може да бъде обновен"
+
#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
@@ -4276,7 +4720,7 @@ msgstr "Вече Ñте на „%s“\n"
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и занулÑване на промените\n"
-#: builtin/checkout.c:677 builtin/checkout.c:1066
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“\n"
@@ -4348,7 +4792,7 @@ msgstr "вътрешна грешка при обхождането на верÑ
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ Ñочеше към"
-#: builtin/checkout.c:823 builtin/checkout.c:1061
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "Ð’ момента Ñте на клон, който предÑтои да бъде Ñъздаден"
@@ -4357,137 +4801,137 @@ msgstr "Ð’ момента Ñте на клон, който предÑтои да
msgid "only one reference expected, %d given."
msgstr "очакваше Ñе един указател, а Ñте подали %d."
-#: builtin/checkout.c:1007 builtin/worktree.c:213
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1036
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателÑÑ‚ не Ñочи към обект-дърво: %s"
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е неÑъвмеÑтимо Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг"
-#: builtin/checkout.c:1078 builtin/checkout.c:1082
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ Ð¿Ñ€ÐµÐ¼Ð¸Ð½Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ от един клон към друг"
-#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
-#: builtin/checkout.c:1097
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опциÑта „%s“ е неÑъвмеÑтима Ñ â€ž%s“"
-#: builtin/checkout.c:1102
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който Ñочи към подаване. „%s“ не "
"е такъв"
-#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
-#: builtin/worktree.c:322
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "Ñъздаване и преминаване към нов клон"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "Ñъздаване/занулÑване на клон и преминаване към него"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "Ñъздаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "отделÑне на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към указаното подаване"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива Ñледен при Ñъздаването на Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "ÐОВ_КЛОÐ"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "изтеглÑне на вашата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "изтеглÑне на чуждата верÑÐ¸Ñ Ð½Ð° неÑлетите файлове"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтеглÑне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно Ñливане Ñ Ð½Ð¾Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/checkout.c:1150 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "обновÑване на игнорираните файлове (Ñтандартно)"
-#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
-msgstr "Ñтил"
+msgstr "СТИЛ"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "дейÑтвие при конфликт (Ñливане или тройна разлика)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища Ñамо до чаÑтично изтеглените"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон Ñлед неуÑпешен опит Ñ â€žgit checkout "
"ÐЕСЪЩЕСТВУВÐЩ_КЛОГ"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателÑ"
-#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ Ñа неÑъвмеÑтими една Ñ Ð´Ñ€ÑƒÐ³Ð°"
-#: builtin/checkout.c:1208
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "опциÑта „--track“ изиÑква име на клон"
-#: builtin/checkout.c:1213
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "ЛипÑва име на клон, използвайте опциÑта „-b“"
-#: builtin/checkout.c:1249
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1256
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4496,12 +4940,12 @@ msgstr ""
"Ðе можете едновременно да обновÑвате пътища и да преминете към клона „%s“.\n"
"Дали не иÑкате да изтеглите „%s“, който не Ñочи към подаване?"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опциÑта „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1265
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4539,7 +4983,7 @@ msgstr "Хранилището „%s“ ще бъде преÑкочено\n"
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:315
+#: builtin/clean.c:291
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -4551,7 +4995,7 @@ msgstr ""
"ПРЕФИКС — избор на единÑтвен обект по този уникален префикÑ\n"
" — (празно) нищо да не Ñе избира"
-#: builtin/clean.c:319
+#: builtin/clean.c:295
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -4571,38 +5015,38 @@ msgstr ""
"* — избиране на вÑички обекти\n"
" — (празно) завършване на избирането"
-#: builtin/clean.c:535
+#: builtin/clean.c:511
#, c-format
msgid "Huh (%s)?"
msgstr "Ðеправилен избор (%s). Изберете отново."
# FIXME - should we use >> or sth else
-#: builtin/clean.c:677
+#: builtin/clean.c:653
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:714
+#: builtin/clean.c:690
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðикой обект не напаÑва на „%s“"
-#: builtin/clean.c:735
+#: builtin/clean.c:711
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:776
+#: builtin/clean.c:752
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да Ñе изтрие ли „%s“? „y“ — да, „N“ — ÐЕ"
# FIXME improve message
-#: builtin/clean.c:801
+#: builtin/clean.c:777
msgid "Bye."
msgstr "Изход."
-#: builtin/clean.c:809
+#: builtin/clean.c:785
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -4620,63 +5064,63 @@ msgstr ""
"help — този край\n"
"? — подÑказка за шаблоните"
-#: builtin/clean.c:836
+#: builtin/clean.c:812
msgid "*** Commands ***"
msgstr "â—â—◠Команди â—â—â—"
# FIXME improve message
-#: builtin/clean.c:837
+#: builtin/clean.c:813
msgid "What now"
msgstr "Избор на Ñледващо дейÑтвие"
-#: builtin/clean.c:845
+#: builtin/clean.c:821
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "СледниÑÑ‚ обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:862
+#: builtin/clean.c:838
msgid "No more files to clean, exiting."
msgstr "Файловете за изчиÑтване Ñвършиха. Изход от програмата."
-#: builtin/clean.c:893
+#: builtin/clean.c:869
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:895
+#: builtin/clean.c:871
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:896
+#: builtin/clean.c:872
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:898
+#: builtin/clean.c:874
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
-#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
-msgstr "шаблон"
+msgstr "ШÐБЛОÐ"
-#: builtin/clean.c:900
+#: builtin/clean.c:876
msgid "add <pattern> to ignore rules"
msgstr "добавÑне на ШÐБЛОРот файлове, които да не Ñе триÑÑ‚"
-#: builtin/clean.c:901
+#: builtin/clean.c:877
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:903
+#: builtin/clean.c:879
msgid "remove only ignored files"
msgstr "изтриване Ñамо на игнорирани файлове"
-#: builtin/clean.c:921
+#: builtin/clean.c:897
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ Ñа неÑъвмеÑтими"
-#: builtin/clean.c:925
+#: builtin/clean.c:901
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -4684,7 +5128,7 @@ msgstr ""
"ÐаÑтройката „clean.requireForce“ е зададена като иÑтина, което изиÑква нÑÐºÐ¾Ñ "
"от опциите „-i“, „-n“ или „-f“. ÐÑма да Ñе извърши изчиÑтване"
-#: builtin/clean.c:928
+#: builtin/clean.c:904
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -4697,148 +5141,168 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРÐÐИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:59
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "без Ñъздаване на работно дърво"
-#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "Ñъздаване на голо хранилище"
-#: builtin/clone.c:64
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr ""
"Ñъздаване на хранилище-огледало (включва опциÑта „--bare“ за голо хранилище)"
-#: builtin/clone.c:66
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:68
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да Ñе копират"
-#: builtin/clone.c:70
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "наÑтройване за Ñподелено хранилище"
-#: builtin/clone.c:72 builtin/clone.c:74
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:75 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "брой подмодули, клонирани паралелно"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸"
-#: builtin/clone.c:76 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "директориÑ, коÑто Ñъдържа шаблоните, които да Ñе ползват"
-#: builtin/clone.c:78 builtin/submodule--helper.c:179
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:80
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "опциÑта „--reference“ може да Ñе използва Ñамо при клониране"
-#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:82
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вмеÑто „origin“ при проÑледÑване на клони"
-#: builtin/clone.c:84
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтеглÑне на този КЛОÐ, а не ÑочениÑÑ‚ от Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» „HEAD“"
-#: builtin/clone.c:86
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "ДЪЛБОЧИÐÐ"
-#: builtin/clone.c:88
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИÐÐ"
-#: builtin/clone.c:90
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране Ñамо на един клон — или ÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ â€žHEAD“, или изрично "
"Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ â€ž--branch“"
-#: builtin/clone.c:91 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "вÑички клонирани подмодули ще Ñа плитки"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "СЛУЖЕБÐÐ_ДИРЕКТОРИЯ"
-#: builtin/clone.c:92 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБÐÐ_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:93
+#: builtin/clone.c:100
msgid "key=value"
msgstr "КЛЮЧ=СТОЙÐОСТ"
-#: builtin/clone.c:94
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "задаване на наÑтройките на новото хранилище"
-#: builtin/clone.c:300
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
+msgid "use IPv4 addresses only"
+msgstr "Ñамо адреÑи IPv4"
+
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
+msgid "use IPv6 addresses only"
+msgstr "Ñамо адреÑи IPv6"
+
+#: builtin/clone.c:241
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директориÑта не може да бъде отгатнато.\n"
+"Задайте директориÑта изрично на ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´"
+
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "вÑе още не Ñе поддържа еталонно хранилище „%s“ като Ñвързано."
-#: builtin/clone.c:302
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: builtin/clone.c:307
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: builtin/clone.c:310
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е Ñ Ð¿Ñ€Ð¸Ñаждане"
-#: builtin/clone.c:375 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
-
-#: builtin/clone.c:377
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ ÑъщеÑтвува и не е директориÑ"
-#: builtin/clone.c:391
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде Ñъздадена"
-#: builtin/clone.c:417
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:442 builtin/clone.c:626
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "дейÑтвието завърши.\n"
-#: builtin/clone.c:454
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4849,7 +5313,7 @@ msgstr ""
"клон в момента Ñа изтеглени Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git status“. Можете да\n"
"завършите изтеглÑнето на клона Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „git checkout -f HEAD“.\n"
-#: builtin/clone.c:531
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
@@ -4857,116 +5321,126 @@ msgstr ""
"и който Ñледва да бъде изтеглен, не ÑъщеÑтвува."
# FIXME translator note that the space at end is necesssary
-#: builtin/clone.c:621
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Проверка на връзката… "
-#: builtin/clone.c:624
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати вÑички необходими обекти."
-#: builtin/clone.c:688
+# FIXME merge with next?
+#: builtin/clone.c:649
+#, c-format
+msgid "unable to update %s"
+msgstr "обектът „%s“ не може да бъде обновен"
+
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателÑÑ‚ „HEAD“ от отдалеченото хранилище Ñочи към нещо,\n"
"което не ÑъщеÑтвува. Ðе може да Ñе изтегли определен клон.\n"
-#: builtin/clone.c:719
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:808
+#: builtin/clone.c:767
+msgid "unable to write parameters to config file"
+msgstr "наÑтройките не могат да бъдат запиÑани в ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
+
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "не може да Ñе извърши пакетиране за изчиÑтване на файловете"
-#: builtin/clone.c:810
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "временниÑÑ‚ файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:842
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:846
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "ТрÑбва да укажете кое хранилище иÑкате да клонирате."
-#: builtin/clone.c:857
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ Ñа неÑъвмеÑтими."
-#: builtin/clone.c:860
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ Ñа неÑъвмеÑтими."
-#: builtin/clone.c:873
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "не ÑъщеÑтвува хранилище „%s“"
-#: builtin/clone.c:879 builtin/fetch.c:1166
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината Ñ‚Ñ€Ñбва да е положително цÑло чиÑло, а не „%s“"
-#: builtin/clone.c:889
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевиÑÑ‚ път „%s“ ÑъщеÑтвува и не е празна директориÑ."
-#: builtin/clone.c:899
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече ÑъщеÑтвува работно дърво."
-#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
-#: builtin/worktree.c:221 builtin/worktree.c:248
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителÑките директории на „%s“ не могат да бъдат Ñъздадени"
-#: builtin/clone.c:917
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде Ñъздадено."
-#: builtin/clone.c:935
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и Ñъздаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:937
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и Ñъздаване на хранилище в „%s“…\n"
-#: builtin/clone.c:975
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опциÑта „--depth“ Ñе игнорира. Ползвайте Ñхемата "
"„file://“."
-#: builtin/clone.c:978
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опциÑта „--local“ Ñе игнорира"
-#: builtin/clone.c:983
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "опциÑта „--local“ Ñе игнорира"
-#: builtin/clone.c:987
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Ðе Ñе поддържа клониране на връзки от вида „%s“ "
-#: builtin/clone.c:1036 builtin/clone.c:1044
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ОтдалечениÑÑ‚ клон „%s“ липÑва в клонираното хранилище „%s“"
-#: builtin/clone.c:1047
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -5110,66 +5584,66 @@ msgstr ""
"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
"оÑтаналите подаваниÑ.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде Ñъздаден"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "неуÑпешно интерактивно добавÑне"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде обновен"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Дървото на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ ÐºÐµÑˆ не може да бъде обновено"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "новиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "по време на Ñливане не може да Ñе извърши чаÑтично подаване."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да Ñе извърши чаÑтично подаване."
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "индекÑÑŠÑ‚ не може да бъде прочетен"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "временниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната чаÑÑ‚ за автор в подаването „%s“ липÑва"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната чаÑÑ‚ за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "неправилен параметър към опциÑта „--author“"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5177,39 +5651,39 @@ msgstr ""
"не може да Ñе избере знак за коментар — в текущото Ñъобщение за подаване Ñа "
"използвани вÑички подобни знаци"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "Ñледното подаване не може да бъде открито: %s"
-#: builtin/commit.c:702 builtin/shortlog.c:273
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на Ñъобщението за подаване от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "Ñъобщението за подаване не бе прочетено ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът ÑÑŠÑ Ñъобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "Ñъобщението за Ñливане MERGE_MSG не може да бъде прочетено"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "Ñъобщението за Ñмачкване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "Ñъобщението за Ñливане MERGE_MSG не може да бъде прочетено"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
# FIXME
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5225,7 +5699,7 @@ msgstr ""
"и опитайте отново.\n"
# FIXME
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5241,7 +5715,7 @@ msgstr ""
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5250,7 +5724,7 @@ msgstr ""
"Въведете Ñъобщението за подаване на промените. Редовете, които започват\n"
"Ñ â€ž%c“, ще бъдат пропуÑнати, а празно Ñъобщение преуÑтановÑва подаването.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5261,96 +5735,96 @@ msgstr ""
"Ñ â€ž%c“, Ñъщо ще бъдат включени — може да ги изтриете вие. Празно \n"
"Ñъобщение преуÑтановÑва подаването.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sÐвтор: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте Ñъобщението Ñ Ð½ÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"ОпциÑта „--author '%s'“ не Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° форма̀та „Име <е-поща>“ и не Ñъвпада Ñ "
"никой автор"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ðеправилна ÑтойноÑÑ‚ за неÑледените файлове: „%s“"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ Ñа неÑъвмеÑтими."
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ Ñа неÑъвмеÑтими."
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "ÐÑма какво да бъде поправено."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ð’ момента Ñе извършва Ñливане, не можете да поправÑте."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Ð’ момента Ñе извършва отбиране на подаване, не можете да поправÑте."
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ Ñа неÑъвмеÑтими."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ Ñа неÑъвмеÑтими."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "ОпциÑта „-m“ е неÑъвмеÑтима Ñ â€ž-c“, „-C“, „-F“ и „--fixup“."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"ОпциÑта „--reset-author“ може да Ñе използва Ñамо заедно Ñ â€ž-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ Ñа\n"
"неÑъвмеÑтими."
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изиÑкват аргументи."
# FIXME bad message
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr ""
"ЧудеÑно Ñте Ñе Ñетили как да поправите Ñъобщението на поÑледното подаване "
@@ -5358,271 +5832,269 @@ msgstr ""
"променен индекÑ. Споделете и Ñ Ð´Ñ€ÑƒÐ³ потребител трика Ñ â€žgit commit --amend -"
"o“."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Зададени Ñа изрични пътища без опциите „-i“ или „-o“. Приема Ñе, че вÑе едно "
"Ñте\n"
"ползвали опциÑта „--only“ Ñ ÐŸÐªÐ¢Ð¸Ñ‰Ð°â€¦"
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "ÐеÑъщеÑтвуващ режим на изчиÑтване „%s“"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "ОпциÑта „-a“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½ÐµÑ‚Ð¾ на пътища."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "кратка Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° клоните"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
-#: builtin/worktree.c:423
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "подробна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° ÑÑŠÑтоÑнието (Ñтандартно)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "разделÑне на елементите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
-msgstr "режим"
+msgstr "РЕЖИМ"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-"извеждане на неÑледените файлове. Възможните режими Ñа „all“ (подробна\n"
-"информациÑ), „normal“ (кратка информациÑ), „no“ (без неÑледените файлове).\n"
-"СтандартниÑÑ‚ режим е: „all“."
+"извеждане на неÑледените файлове. Възможните РЕЖИМи Ñа „all“ (подробна "
+"информациÑ), „normal“ (кратка информациÑ), „no“ (без неÑледените файлове). "
+"СтандартниÑÑ‚ РЕЖИМ е: „all“."
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "извеждане на игнорираните файлове"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
-msgstr "кога"
+msgstr "КОГÐ"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"игнориране на промените в подмодулите. ÐžÐ¿Ñ†Ð¸Ñ Ñ Ð½ÐµÐ·Ð°Ð´ÑŠÐ»Ð¶Ð¸Ñ‚ÐµÐ»Ð½Ð° ÑтойноÑÑ‚ — "
-"една от\n"
-"„all“ (вÑички), „dirty“ (тези Ñ Ð½ÐµÐ¿Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸ промени), „untracked“ (неÑледени)"
+"една от „all“ (вÑички), „dirty“ (тези Ñ Ð½ÐµÐ¿Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸ промени), "
+"„untracked“ (неÑледени)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "извеждане на неÑледените файлове в колони"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "току що Ñъздаденото подаване не може да бъде открито"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "току що Ñъздаденото подаване не може да бъде анализирано"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "неÑвързан връх „HEAD“"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "без Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñлед уÑпешно подаване"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "добавÑне на разликата към шаблона за Ñъобщението при подаване"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Опции за Ñъобщението при подаване"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
-msgstr "взимане на Ñъобщението от файл"
+msgstr "взимане на Ñъобщението от ФÐЙЛ"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
-msgstr "автор"
+msgstr "ÐВТОР"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
-msgstr "задаване на автор за подаването"
+msgstr "задаване на ÐВТОР за подаването"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
-msgstr "дата"
+msgstr "ДÐТÐ"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
-msgstr "задаване на дата за подаването"
+msgstr "задаване на ДÐТРза подаването"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
-#: builtin/notes.c:555 builtin/tag.c:349
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
+#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
-msgstr "Ñъобщение"
+msgstr "СЪОБЩЕÐИЕ"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
-msgstr "Ñъобщение при подаване"
+msgstr "СЪОБЩЕÐИЕ при подаване"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
-msgstr "подаване"
+msgstr "ПОДÐÐ’ÐÐЕ"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
-msgstr "преизползване и редактиране на Ñъобщението от указаното подаване"
+msgstr "преизползване и редактиране на Ñъобщението от указаното ПОДÐÐ’ÐÐЕ"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
-msgstr "преизползване на Ñъобщението от указаното подаване"
+msgstr "преизползване на Ñъобщението от указаното ПОДÐÐ’ÐÐЕ"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-"използване на автоматичното Ñъобщение при Ñмачкване за вкарване на "
-"указаното\n"
-"подаване в предното без Ñледа"
+"използване на автоматичното Ñъобщение при Ñмачкване за вкарване на указаното "
+"ПОДÐÐ’ÐÐЕ в предното без Ñледа"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното Ñъобщение при Ñмачкване за Ñмачкване на "
-"указаното\n"
-"подаване в предното"
+"указаното ПОДÐÐ’ÐÐЕ в предното"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"ÑмÑна на автора да Ñъвпада Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ñ‰Ð¸Ñ (използва Ñе Ñ â€ž-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавÑне на поле за Ð¿Ð¾Ð´Ð¿Ð¸Ñ â€” „Signed-off-by:“"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
-msgstr "използване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½ÐµÐ½ файл"
+msgstr "използване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½ÐµÐ½ ФÐЙЛ"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "Ñтандартно"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да Ñе махат от ÑъобщениÑта"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "вмъкване на ÑÑŠÑтоÑнието в шаблона за Ñъобщението при подаване"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подпиÑване на подаването Ñ GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "подаване на вÑички променени файлове"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "добавÑне на указаните файлове към индекÑа за подаване"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "интерактивно добавÑне на файлове"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "интерактивно добавÑне на промени"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "подаване Ñамо на указаните файлове"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "без изпълнение на куката преди подаване (pre-commit)"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "поправÑне на предишното подаване"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката Ñлед презапиÑване (post-rewrite)"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "позволÑване на празни подаваниÑ"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "позволÑване на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ñ Ð¿Ñ€Ð°Ð·Ð½Ð¸ ÑъобщениÑ"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за Ñливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "режимът на Ñливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "Ñъобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Ðеизвършване на подаване поради нередактирано Ñъобщение.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Ðеизвършване на подаване поради празно Ñъобщение.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5632,145 +6104,151 @@ msgstr ""
"не е запиÑан. Проверете дали диÑкът не е препълнен или не Ñте\n"
"превишили диÑковата Ñи квота. След това изпълнете „git reset HEAD“."
-#: builtin/config.c:8
+#: builtin/config.c:9
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "Config file location"
msgstr "МеÑтоположение на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use global config file"
msgstr "използване на Ð³Ð»Ð¾Ð±Ð°Ð»Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use system config file"
msgstr "използване на ÑиÑÑ‚ÐµÐ¼Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "използване на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» на хранилището"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "use given config file"
-msgstr "използване на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ файл"
+msgstr "използване на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ ФÐЙЛ"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "blob-id"
-msgstr "идентификатор на BLOB"
+msgstr "ИДЕÐТИФИКÐТОР"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr ""
-"изчитане на конфигурациÑта от BLOB Ñ Ñ‚Ð¾Ð·Ð¸ идентификатор на Ñъдържанието"
+"изчитане на конфигурациÑта от BLOB Ñ Ñ‚Ð¾Ð·Ð¸ ИДЕÐТИФИКÐТОР на Ñъдържанието"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "Action"
msgstr "ДейÑтвие"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "извеждане на ÑтойноÑÑ‚: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:62
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "извеждане на вÑички ÑтойноÑти: ключ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:63
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
"извеждане на ÑтойноÑтите за РЕГУЛЯРÐиÑ_ИЗРÐЗ: РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_ИМЕТО "
"[РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:64
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "извеждане на ÑтойноÑтта за ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑ: РÐЗДЕЛ[.ПРОМЕÐЛИВÐ] ÐДРЕС"
-#: builtin/config.c:65
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"замÑна на вÑички Ñъвпадащи променливи: ИМЕ СТОЙÐОСТ "
"[РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:66
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "добавÑне на нова променлива: ИМЕ СТОЙÐОСТ"
-#: builtin/config.c:67
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:68
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "изтриване на вÑички Ñъвпадащи: ИМЕ [РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_СТОЙÐОСТТÐ]"
-#: builtin/config.c:69
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "преименуване на раздел: СТÐРО_ИМЕ ÐОВО_ИМЕ"
-#: builtin/config.c:70
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "изтриване на раздел: ИМЕ"
-#: builtin/config.c:71
+#: builtin/config.c:73
msgid "list all"
msgstr "изброÑване на вÑички"
-#: builtin/config.c:72
+#: builtin/config.c:74
msgid "open an editor"
msgstr "отварÑне на редактор"
-#: builtin/config.c:73
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [Ñтандартно]"
-#: builtin/config.c:74
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [ÑтандартниÑÑ‚ изход е терминал]"
-#: builtin/config.c:75
+#: builtin/config.c:77
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:76
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "СТОЙÐОСТТРе „true“ (иÑтина) или „false“ (лъжа)"
-#: builtin/config.c:77
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "СТОЙÐОСТТРе цÑло, деÑетично чиÑло"
-#: builtin/config.c:78
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "СТОЙÐОСТТРе „--bool“ (булева) или „--int“ (деÑетично цÑло чиÑло)"
-#: builtin/config.c:79
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "СТОЙÐОСТТРе път (до файл или директориÑ)"
-#: builtin/config.c:80
+#: builtin/config.c:82
msgid "Other"
msgstr "Други"
# FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo
-#: builtin/config.c:81
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "разделÑне на ÑтойноÑтите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/config.c:82
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "извеждане на имената на променливите"
-#: builtin/config.c:83
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "при Ñ‚ÑŠÑ€Ñене да Ñе уважат и директивите за включване"
-#: builtin/config.c:303
+#: builtin/config.c:86
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"извеждане на мÑÑтото на задаване на наÑтройката (файл, Ñтандартен вход, "
+"обект BLOB, команден ред)"
+
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "неразпозната ÑтойноÑÑ‚ на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ñ†Ð²ÑÑ‚"
-#: builtin/config.c:441
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5785,7 +6263,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:575
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде Ñъздаден"
@@ -5822,7 +6300,7 @@ msgstr "в Ð°Ð½Ð¾Ñ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ „%s“ липÑва вградеÐ
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е вÑъщноÑÑ‚ „%s“"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "Ðеправилно име на обект „%s“"
@@ -5918,7 +6396,7 @@ msgstr "да Ñе Ñ‚ÑŠÑ€Ñи Ñамо в този БРОЙ поÑледни ет
msgid "only consider tags matching <pattern>"
msgstr "да Ñе Ñ‚ÑŠÑ€Ñи Ñамо измежду етикетите напаÑващи този ШÐБЛОÐ"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на Ñъкратено име на обект като резервен вариант"
@@ -5952,21 +6430,21 @@ msgstr "„%s“: не е нито обикновен файл, нито ÑимÐ
msgid "invalid option: %s"
msgstr "неправилна опциÑ: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Ðе е хранилище на Git"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени Ñа повече от 2 обекта BLOB: „%s“"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
@@ -5989,11 +6467,11 @@ msgstr "Как да Ñе обработват етикетите на филтр
#: builtin/fast-export.c:988
msgid "Dump marks to this file"
-msgstr "Запазване на маркерите в този файл"
+msgstr "Запазване на маркерите в този ФÐЙЛ"
#: builtin/fast-export.c:990
msgid "Import marks from this file"
-msgstr "ВнаÑÑне на маркерите от този файл"
+msgstr "ВнаÑÑне на маркерите от този ФÐЙЛ"
#: builtin/fast-export.c:992
msgid "Fake a tagger when tags lack one"
@@ -6013,11 +6491,11 @@ msgstr "Без извеждане на Ñъдържанието на обектÐ
#: builtin/fast-export.c:998
msgid "refspec"
-msgstr "указател на верÑиÑ"
+msgstr "УКÐЗÐТЕЛ_ÐÐ_ВЕРСИЯ"
#: builtin/fast-export.c:999
msgid "Apply refspec to exported refs"
-msgstr "Прилагане на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° верÑÐ¸Ñ ÐºÑŠÐ¼ изнеÑените указатели"
+msgstr "Прилагане на УКÐЗÐТЕЛÑ_ÐÐ_ВЕРСИЯ към изнеÑените указатели"
#: builtin/fast-export.c:1000
msgid "anonymize output"
@@ -6039,164 +6517,163 @@ msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРÐÐИЛИЩЕ | ГРУПÐ)â
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:90 builtin/pull.c:162
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "доÑтавÑне от вÑички отдалечени хранилища"
-#: builtin/fetch.c:92 builtin/pull.c:165
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавÑне към „.git/FETCH_HEAD“ вмеÑто замÑна"
-#: builtin/fetch.c:94 builtin/pull.c:168
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да Ñе качи пакетът"
-#: builtin/fetch.c:95 builtin/pull.c:170
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "принудително презапиÑване на Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:99
msgid "fetch from multiple remotes"
msgstr "доÑтавÑне от множеÑтво отдалечени хранилища"
-#: builtin/fetch.c:99 builtin/pull.c:172
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "доÑтавÑне на вÑички етикети и принадлежащи обекти"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:103
msgid "do not fetch all tags (--no-tags)"
msgstr "без доÑтавÑнето на вÑички етикети „--no-tags“"
-#: builtin/fetch.c:103 builtin/pull.c:175
+#: builtin/fetch.c:105
+msgid "number of submodules fetched in parallel"
+msgstr "брой подмодули доÑтавени паралелно"
+
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "окаÑÑ‚Ñ€Ñне на клоните ÑледÑщи вече неÑъщеÑтвуващи отдалечени клони"
-#: builtin/fetch.c:104 builtin/pull.c:178
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
-msgstr "при нужда"
+msgstr "ПРИ ÐУЖДÐ"
-#: builtin/fetch.c:105 builtin/pull.c:179
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "управление на рекурÑивното доÑтавÑне на подмодулите"
-#: builtin/fetch.c:109 builtin/pull.c:184
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸"
-#: builtin/fetch.c:111
+#: builtin/fetch.c:115
msgid "allow updating of HEAD ref"
msgstr "позволÑване на обновÑването на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“"
-#: builtin/fetch.c:114 builtin/pull.c:187
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "задълбочаване на иÑториÑта на плитко хранилище"
-#: builtin/fetch.c:116 builtin/pull.c:190
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:118 builtin/log.c:1233
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "директориÑ"
-#: builtin/fetch.c:119
+#: builtin/fetch.c:123
msgid "prepend this to submodule path output"
msgstr "добавÑне на това пред Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:126
msgid "default mode for recursion"
msgstr "Ñтандартен режим на рекурÑиÑ"
-#: builtin/fetch.c:124 builtin/pull.c:193
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновÑват „.git/shallow“"
-#: builtin/fetch.c:125 builtin/pull.c:195
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
-msgstr "карта Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸"
+msgstr "КÐРТÐ_С_УКÐЗÐТЕЛИ"
-#: builtin/fetch.c:126 builtin/pull.c:196
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
-msgstr "указване на картата Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸ за доÑтавÑне"
+msgstr "указване на КÐРТÐта_С_УКÐЗÐТЕЛИ за доÑтавÑне"
-#: builtin/fetch.c:378
+#: builtin/fetch.c:386
msgid "Couldn't find remote ref HEAD"
msgstr "УказателÑÑ‚ „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:458
+#: builtin/fetch.c:466
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липÑва"
-#: builtin/fetch.c:463
+#: builtin/fetch.c:471
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:477
+#: builtin/fetch.c:485
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s → %s (в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ не може да Ñе доÑтавÑ)"
-#: builtin/fetch.c:478 builtin/fetch.c:566
+#: builtin/fetch.c:486 builtin/fetch.c:574
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:489
+#: builtin/fetch.c:497
msgid "[tag update]"
msgstr "[обновÑване на етикетите]"
-#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
+#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
msgid " (unable to update local ref)"
msgstr " (локалните указатели не могат да бъдат обновени)"
-#: builtin/fetch.c:509
+#: builtin/fetch.c:517
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:520
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:515
+#: builtin/fetch.c:523
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:561
+#: builtin/fetch.c:569
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:561
+#: builtin/fetch.c:569
msgid "forced update"
msgstr "принудително обновÑване"
-#: builtin/fetch.c:568
+#: builtin/fetch.c:576
msgid "(non-fast-forward)"
msgstr "(Ñливането не е тривиално)"
-#: builtin/fetch.c:602 builtin/fetch.c:843
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "файлът „%s“ не може да бъде отворен: %s\n"
-
-#: builtin/fetch.c:611
+#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати вÑички необходими обекти\n"
-#: builtin/fetch.c:629
+#: builtin/fetch.c:637
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърлÑне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновÑвани"
-#: builtin/fetch.c:716 builtin/fetch.c:808
+#: builtin/fetch.c:724 builtin/fetch.c:816
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
# FIXME - is the space necessary
-#: builtin/fetch.c:727
+#: builtin/fetch.c:735
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -6206,55 +6683,55 @@ msgstr ""
"„git remote prune %s“, за да премахнете оÑтарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:787
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще Ñе окаже извън клон)"
-#: builtin/fetch.c:780
+#: builtin/fetch.c:788
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:820
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:813 builtin/remote.c:1040
+#: builtin/fetch.c:821 builtin/remote.c:1025
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:833
+#: builtin/fetch.c:841
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Ðе може да доÑтавите в Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:852
+#: builtin/fetch.c:860
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "СтойноÑтта „%2$s“ за опциÑта „%1$s“ не е ÑъвмеÑтима Ñ â€ž%3$s“"
-#: builtin/fetch.c:855
+#: builtin/fetch.c:863
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "ОпциÑта „%s“ Ñе игнорира при „%s“\n"
-#: builtin/fetch.c:911
+#: builtin/fetch.c:920
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Ðе Ñе поддържа доÑтавÑне от „%s“"
-#: builtin/fetch.c:1072
+#: builtin/fetch.c:1080
#, c-format
msgid "Fetching %s\n"
msgstr "ДоÑтавÑне на „%s“\n"
-#: builtin/fetch.c:1074 builtin/remote.c:96
+#: builtin/fetch.c:1082 builtin/remote.c:96
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да Ñе доÑтави"
-#: builtin/fetch.c:1092
+#: builtin/fetch.c:1100
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -6262,33 +6739,33 @@ msgstr ""
"Ðе Ñте указали отдалечено хранилище. Задайте или адреÑ, или име\n"
"на отдалечено хранилище, откъдето да Ñе доÑтавÑÑ‚ новите верÑии."
-#: builtin/fetch.c:1115
+#: builtin/fetch.c:1123
msgid "You need to specify a tag name."
msgstr "ТрÑбва да укажете име на етикет."
-#: builtin/fetch.c:1157
+#: builtin/fetch.c:1165
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ Ñа неÑъвмеÑтими"
-#: builtin/fetch.c:1159
+#: builtin/fetch.c:1167
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опциÑта „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1179
+#: builtin/fetch.c:1187
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1189
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на верÑиÑ"
-#: builtin/fetch.c:1192
+#: builtin/fetch.c:1200
#, c-format
msgid "No such remote or remote group: %s"
msgstr "ÐÑма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1200
+#: builtin/fetch.c:1208
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на верÑÐ¸Ñ Ñа неÑъвмеÑтими"
@@ -6362,7 +6839,7 @@ msgstr "ФОРМÐТ за изхода"
#: builtin/for-each-ref.c:41
msgid "print only refs which points at the given object"
-msgstr "извеждане Ñамо на указателите, Ñочещи към обекта"
+msgstr "извеждане Ñамо на указателите, Ñочещи към ОБЕКТÐ"
#: builtin/for-each-ref.c:43
msgid "print only refs that are merged"
@@ -6374,7 +6851,7 @@ msgstr "извеждане Ñамо на неÑлетите указатели"
#: builtin/for-each-ref.c:45
msgid "print only refs which contain the commit"
-msgstr "извеждане Ñамо на указателите, които Ñъдържат това подаване"
+msgstr "извеждане Ñамо на указателите, които Ñъдържат това ПОДÐÐ’ÐÐЕ"
#: builtin/fsck.c:156 builtin/prune.c:140
msgid "Checking connectivity"
@@ -6384,56 +6861,56 @@ msgstr "Проверка на връзката"
msgid "Checking object directories"
msgstr "Проверка на директориите Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "показване на недоÑтижимите обекти"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекÑа да Ñа коренови"
# FIXME bad message
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "проÑледÑване на указателите от журнала като глави (Ñтандартно)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "допълнително да Ñе проверÑват пакетите и алтернативните обекти"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "проверка Ñамо на връзката"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "по-Ñтроги проверки"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директориÑта „.git/lost-found“"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Проверка на обектите"
@@ -6527,239 +7004,253 @@ msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШÐБЛОР[ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:218
+#: builtin/grep.c:219
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуÑпешно Ñъздаване на нишка: %s"
-#: builtin/grep.c:441 builtin/grep.c:476
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "зададен е неправилен брой нишки (%d) за %s"
+
+#: builtin/grep.c:452 builtin/grep.c:487
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:491
+#: builtin/grep.c:502
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да Ñе изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:547
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опциÑта „%c“ очаква чиÑло за аргумент"
-#: builtin/grep.c:564
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: builtin/grep.c:633
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "Ñ‚ÑŠÑ€Ñене в индекÑа, а не в работното дърво"
-#: builtin/grep.c:635
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "Ñ‚ÑŠÑ€Ñене и във файловете, които не Ñа под управлението на git"
-#: builtin/grep.c:637
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "Ñ‚ÑŠÑ€Ñене и в Ñледените, и в неÑледените файлове"
-#: builtin/grep.c:639
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:642
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не Ñъвпадат"
-#: builtin/grep.c:644
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "без значение на региÑтъра на буквите (главни/малки)"
-#: builtin/grep.c:646
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "напаÑване на шаблоните Ñамо по границите на думите"
-#: builtin/grep.c:648
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текÑтови"
-#: builtin/grep.c:650
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "преÑкачане на двоичните файлове"
-#: builtin/grep.c:653
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текÑÑ‚"
-#: builtin/grep.c:655
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "навлизане макÑимално на тази ДЪЛБОЧИÐРв дървото"
-#: builtin/grep.c:659
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "разширени регулÑрни изрази по POSIX"
-#: builtin/grep.c:662
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "оÑновни регулÑрни изрази по POSIX (Ñтандартно)"
-#: builtin/grep.c:665
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "шаблоните Ñа доÑловни низове"
-#: builtin/grep.c:668
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "регулÑрни изрази на Perl"
-#: builtin/grep.c:671
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:672
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:673
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:675
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на отноÑителните имена на файловете ÑпрÑмо оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° "
"хранилището"
-#: builtin/grep.c:677
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "извеждане Ñамо на имената на файловете без напаÑващите редове"
-#: builtin/grep.c:679
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "Ñиноним на „--files-with-matches“"
-#: builtin/grep.c:682
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr ""
"извеждане Ñамо на имената на файловете, които не Ñъдържат ред, напаÑващ на "
"шаблона"
-#: builtin/grep.c:684
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "извеждане на Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“ Ñлед вÑÑко име на файл"
-#: builtin/grep.c:686
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на Ð±Ñ€Ð¾Ñ Ð½Ð° ÑъвпадениÑта вмеÑто напаÑващите редове"
-#: builtin/grep.c:687
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "оцветÑване на напаÑваниÑта"
-#: builtin/grep.c:689
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напаÑваниÑта от различни файлове"
-#: builtin/grep.c:691
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла Ñамо веднъж за вÑички напаÑÐ²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ този файл"
-#: builtin/grep.c:694
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и Ñлед напаÑваниÑта"
-#: builtin/grep.c:697
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напаÑваниÑта"
-#: builtin/grep.c:699
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове Ñлед напаÑваниÑта"
-#: builtin/grep.c:700
+#: builtin/grep.c:714
+msgid "use <n> worker threads"
+msgstr "използване на такъв БРОЙ работещи нишки"
+
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "Ñиноним на „-C БРОЙ“"
-#: builtin/grep.c:703
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "извеждане на ред Ñ Ð¸Ð¼ÐµÑ‚Ð¾ на функциÑта, в коÑто е напаÑнат шаблона"
-#: builtin/grep.c:705
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функциÑ"
-#: builtin/grep.c:708
+#: builtin/grep.c:723
msgid "read patterns from file"
-msgstr "изчитане на шаблоните от файл"
+msgstr "изчитане на шаблоните от ФÐЙЛ"
-#: builtin/grep.c:710
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "напаÑване на ШÐБЛОÐ"
-#: builtin/grep.c:712
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-e“"
-#: builtin/grep.c:724
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´. ИзходниÑÑ‚ код указва наличието на "
"напаÑване"
-#: builtin/grep.c:726
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове Ñамо от файловете, които напаÑват на вÑички шаблони"
-#: builtin/grep.c:728
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð·"
-#: builtin/grep.c:732
+#: builtin/grep.c:747
msgid "pager"
msgstr "програма за преглед по Ñтраници"
-#: builtin/grep.c:732
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "извеждане на Ñъвпадащите файлове в програма за преглед по Ñтраници"
-#: builtin/grep.c:735
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволÑване на Ñтартирането на grep(1) (текущиÑÑ‚ компилат пренебрегва тази "
"опциÑ)"
-#: builtin/grep.c:793
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "липÑва шаблон."
-#: builtin/grep.c:851
+#: builtin/grep.c:845 builtin/index-pack.c:1477
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "зададен е неправилен брой нишки: %d"
+
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опциÑта „--open-files-in-pager“ е ÑъвмеÑтима Ñамо Ñ Ñ‚ÑŠÑ€Ñене в работното дърво"
-#: builtin/grep.c:877
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "опциите „--cached“ и „--untracked“ Ñа неÑъвмеÑтими Ñ â€ž--no-index“."
-#: builtin/grep.c:882
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"опциите „--cached“ и „--untracked“ Ñа неÑъвмеÑтими Ñ Ñ‚ÑŠÑ€Ñене във верÑии."
-#: builtin/grep.c:885
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"опциите „--(no-)exclude-standard“ Ñа неÑъвмеÑтими Ñ Ñ‚ÑŠÑ€Ñене по Ñледени "
"файлове."
-#: builtin/grep.c:893
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "опциÑта „--cached“ е неÑъвмеÑтима ÑÑŠÑ Ð·Ð°Ð´Ð°Ð²Ð°Ð½Ðµ на дърво."
-#: builtin/hash-object.c:80
+#: builtin/hash-object.c:81
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -6767,40 +7258,40 @@ msgstr ""
"git hash-object [-t ВИД] [-w] [--path=ФÐЙЛ | --no-filters] [--stdin] [--] "
"ФÐЙЛ…"
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:92
+#: builtin/hash-object.c:93
msgid "type"
msgstr "ВИД"
-#: builtin/hash-object.c:92
+#: builtin/hash-object.c:93
msgid "object type"
-msgstr "вид на обекта"
+msgstr "ВИД на обекта"
-#: builtin/hash-object.c:93
+#: builtin/hash-object.c:94
msgid "write the object into the object database"
msgstr "запиÑване на обекта в базата от данни за обектите"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
msgid "read the object from stdin"
msgstr "изчитане на обекта от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "store file as is without filters"
msgstr "запазване на файла както е — без филтри"
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"Ñъздаване и хеширане на произволни данни за повредени обекти за траÑиране на "
"Git"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "process file as it were from this path"
-msgstr "обработване на файла вÑе едно е Ñ Ñ‚Ð¾Ð·Ð¸ път"
+msgstr "обработване на ФÐЙЛа вÑе едно е Ñ Ñ‚Ð¾Ð·Ð¸ път"
#: builtin/help.c:41
msgid "print all available commands"
@@ -6846,10 +7337,10 @@ msgstr "Прекалено Ñтара верÑÐ¸Ñ Ð½Ð° „emacsclient“ — %d
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "неуÑпешно изпълнение на „%s“: %s"
+msgid "failed to exec '%s'"
+msgstr "неуÑпешно изпълнение на „%s“"
-#: builtin/help.c:208
+#: builtin/help.c:205
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -6858,7 +7349,7 @@ msgstr ""
"„%s“: път към неподдържана програма за преглед на\n"
" ръководÑтвото. ВмеÑто Ð½ÐµÑ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ „man.<tool>.cmd“."
-#: builtin/help.c:220
+#: builtin/help.c:217
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -6867,63 +7358,63 @@ msgstr ""
"„%s“: команда за поддържана програма за преглед на\n"
" ръководÑтвото. ВмеÑто Ð½ÐµÑ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ „man.<tool>.path“."
-#: builtin/help.c:337
+#: builtin/help.c:334
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководÑтвото."
-#: builtin/help.c:354
+#: builtin/help.c:351
msgid "no man viewer handled the request"
msgstr "Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на ръководÑтво не уÑÐ¿Ñ Ð´Ð° обработи заÑвката"
-#: builtin/help.c:362
+#: builtin/help.c:359
msgid "no info viewer handled the request"
msgstr ""
"Ð½Ð¸ÐºÐ¾Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° за преглед на информационните Ñтраници не уÑÐ¿Ñ Ð´Ð° обработи "
"заÑвката"
-#: builtin/help.c:411
+#: builtin/help.c:408
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: builtin/help.c:412
+#: builtin/help.c:409
msgid "Everyday Git With 20 Commands Or So"
msgstr "Ежедневието в Git в рамките на 20-ина команди"
-#: builtin/help.c:413
+#: builtin/help.c:410
msgid "A Git glossary"
msgstr "Речник Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð¸Ñ‚Ðµ на Git"
-#: builtin/help.c:414
+#: builtin/help.c:411
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неÑледени файлове, които да бъдат нарочно пренебрегвани"
-#: builtin/help.c:415
+#: builtin/help.c:412
msgid "Defining submodule properties"
msgstr "Дефиниране на ÑвойÑтвата на подмодулите"
-#: builtin/help.c:416
+#: builtin/help.c:413
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на верÑии и интервали в Git"
-#: builtin/help.c:417
+#: builtin/help.c:414
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Въвеждащ урок за Git (верÑии поне 1.5.1)"
-#: builtin/help.c:418
+#: builtin/help.c:415
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа Ñ Git"
-#: builtin/help.c:430
+#: builtin/help.c:427
msgid "The common Git guides are:\n"
msgstr "ПопулÑрните пътеводители в Git Ñа:\n"
-#: builtin/help.c:451 builtin/help.c:468
+#: builtin/help.c:448 builtin/help.c:465
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/help.c:484
+#: builtin/help.c:481
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "„git %s“ е Ñиноним на „%s“"
@@ -7119,118 +7610,115 @@ msgstr ""
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "дейÑтвието завърши Ñ %d локални обекта"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "дейÑтвието завърши Ñ %d локален обект"
+msgstr[1] "дейÑтвието завърши Ñ %d локални обекта"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Ðеочаквана поÑледваща Ñума за грешки за „%s“ (причината може да е грешка в "
"диÑка)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, 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:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавениÑÑ‚ обект не може да Ñе компреÑира Ñ â€ždeflate“: %d"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "локалниÑÑ‚ обект „%s“ е повреден"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "грешка при затварÑнето на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
"грешка при запиÑването на файла „%s“, оÑигурÑващ запазване на директориÑ"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
"грешка при затварÑнето на запиÑÐ°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“, оÑигурÑващ запазване на "
"директориÑ"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "пакетниÑÑ‚ файл не може да бъде запазен"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "файлът за индекÑа не може да бъде Ñъхранен"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна верÑÐ¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ðµ: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1475
-#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr "зададен е неправилен брой нишки: %d"
-
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липÑва поддръжка за нишки. „%s“ ще Ñе пренебрегне"
-#: builtin/index-pack.c:1537
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "СъщеÑтвуващиÑÑ‚ пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1539
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "СъщеÑтвуващиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð·Ð° Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1586
+#: builtin/index-pack.c:1589
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не Ñа разлика"
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
#, 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:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не завършва на „.pack“"
+
# FIXME it is not the cwd it is the previous cwd
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "ПроцеÑÑŠÑ‚ не може да Ñе върне към предишната работна директориÑ"
-#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
-#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "неправилна ÑтойноÑÑ‚ „%s“"
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "опциÑта „--fix-thin“ изиÑква „--stdin“"
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "името на Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» „%s“ не завършва на „.pack“"
-
-#: builtin/index-pack.c:1729
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "опциÑта „--verify“ изиÑква име на пакетен файл"
@@ -7269,28 +7757,27 @@ msgstr "„%s“ не може да Ñе копира в „%s“"
msgid "ignoring template %s"
msgstr "игнориране на шаблона „%s“"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "директориÑта Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸Ñ‚Ðµ не е открита: „%s“"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"шаблоните Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ номер на форма̀та %d нÑма да бъдат копирани от „%s“"
+msgid "not copying templates from '%s': %s"
+msgstr "шаблоните нÑма да бъдат копирани от „%s“: „%s“"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "ДиректориÑта „%s“ вече ÑъщеÑтвува"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "файлове от вид %d не Ñе поддържат"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "„%s“ не може да Ñе премеÑти в „%s“"
@@ -7298,24 +7785,24 @@ msgstr "„%s“ не може да Ñе премеÑти в „%s“"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s хранилище на Git в „%s%s“\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "Ðаново инициализирано, ÑъщеÑтвуващо"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "Инициализирано празно"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr ", Ñподелено"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7323,27 +7810,27 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШÐБЛОÐИ] [--"
"shared[=ПРÐÐ’Ð]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"указване, че хранилището на Git ще бъде Ñподелено от повече от един "
"потребител"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да Ñе влезе в директориÑта „%s“"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7352,31 +7839,39 @@ msgstr ""
"%s (или --work-tree=ДИРЕКТОРИЯ) изиÑква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недоÑтъпно"
#: builtin/interpret-trailers.c:15
msgid ""
-"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
-"[<file>...]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-"git interpret-trailers [--trim-empty] [(--trailer ЛЕКСЕМÐ[(=|:)СТОЙÐОСТ])…] "
-"[ФÐЙЛ…]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"ЛЕКСЕМÐ[(=|:)СТОЙÐОСТ])…] [ФÐЙЛ…]"
-#: builtin/interpret-trailers.c:25
+#: builtin/interpret-trailers.c:26
+msgid "edit files in place"
+msgstr "директно редактиране на файловете"
+
+#: builtin/interpret-trailers.c:27
msgid "trim empty trailers"
msgstr "изчиÑтване на празните епилози"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:28
msgid "trailer"
msgstr "епилог"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:29
msgid "trailer(s) to add"
msgstr "епилог(зи) за добавÑне"
+#: builtin/interpret-trailers.c:42
+msgid "no input file given for in-place editing"
+msgstr "не е зададен входен файл за редактиране на мÑÑто"
+
#: builtin/log.c:43
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] ПЪТ…]"
@@ -7390,277 +7885,327 @@ msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
msgid "invalid --decorate option: %s"
msgstr "неправилна Ð¾Ð¿Ñ†Ð¸Ñ â€ž--decorate“: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "извеждане на Ð¸Ð·Ñ…Ð¾Ð´Ð½Ð¸Ñ ÐºÐ¾Ð´"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr ""
"Използване на файл за ÑъответÑтвиÑта на имената и адреÑите на е-поща („."
"mailmap“)"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "наÑтройки на форма̀та на извежданата информациÑ"
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване Ñамо на редовете във файла в интервала от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Обектът не може да бъде прочетен: %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "ÐеизвеÑтен вид: %d"
-#: builtin/log.c:714
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "не е зададена ÑтойноÑÑ‚ на „format.headers“"
-#: builtin/log.c:798
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директориÑта за изходната информациÑ"
-#: builtin/log.c:813
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:827
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "ТрÑбва да зададете точно един диапазон."
-#: builtin/log.c:837
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Ðе е диапазон."
-#: builtin/log.c:943
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "Придружаващото пиÑмо Ñ‚Ñ€Ñбва да е форматирано като е-пиÑмо"
# FIXME bad wording insanely
-#: builtin/log.c:1022
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната чаÑÑ‚ за отговор „in-reply-to“: %s"
-#: builtin/log.c:1050
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ]"
-# FIXME message WTF why ask it
-#: builtin/log.c:1095
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Можете да укажете макÑимум една Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° изход."
-#: builtin/log.c:1211
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Ðепознато подаване „%s“"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Ðе може да Ñе открие към какво Ñочи „%s“."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Точната база за Ñливане не може да Ñе открие."
+
+#: builtin/log.c:1235
+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=<base-commit-id>“."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Точната база при Ñливане не може да бъде открита"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "базовото подаване Ñ‚Ñ€Ñбва да е предшеÑтвеникът на ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "базовото подаване не може да е в ÑпиÑъка Ñ Ð²ÐµÑ€Ñиите"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "идентификаторът на кръпката не може да бъде получен"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "Ð½Ð¾Ð¼ÐµÑ€Ð°Ñ†Ð¸Ñ â€ž[PATCH n/m]“ дори и при единÑтвена кръпка"
-#: builtin/log.c:1214
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "Ð½Ð¾Ð¼ÐµÑ€Ð°Ñ†Ð¸Ñ â€ž[PATCH]“ дори и при множеÑтво кръпки"
-#: builtin/log.c:1218
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "извеждане на кръпките на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´"
-#: builtin/log.c:1220
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "Ñъздаване на придружаващо пиÑмо"
-#: builtin/log.c:1222
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "проÑта чиÑлова поÑледователноÑÑ‚ за имената на файловете-кръпки"
-#: builtin/log.c:1223
+#: builtin/log.c:1389
msgid "sfx"
msgstr "ЗÐÐЦИ"
-#: builtin/log.c:1224
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗÐÐЦИ за ÑÑƒÑ„Ð¸ÐºÑ Ð²Ð¼ÐµÑто „.patch“"
-#: builtin/log.c:1226
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не Ñ 1"
-#: builtin/log.c:1228
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "отбелÑзване, че това е N-тата поредна Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° поредицата от кръпки"
-#: builtin/log.c:1230
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вмеÑто „[PATCH]“"
-#: builtin/log.c:1233
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1236
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "без добавÑне/махане на префикÑа „[PATCH]“"
-#: builtin/log.c:1239
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1241
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "в заглавната чаÑÑ‚ „From:“ (от) хешът да е Ñамо от нули"
-#: builtin/log.c:1243
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "да не Ñе включват кръпки, които приÑÑŠÑтват в ÑÐ»ÐµÐ´ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/log.c:1245
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ (кръпка и ÑтатиÑтика)"
-#: builtin/log.c:1247
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1248
+#: builtin/log.c:1414
msgid "header"
msgstr "ЗÐГЛÐÐ’ÐÐ_ЧÐСТ"
-#: builtin/log.c:1249
+#: builtin/log.c:1415
msgid "add email header"
msgstr "добавÑне на тази ЗÐГЛÐÐ’ÐÐ_ЧÐСТ"
-#: builtin/log.c:1250 builtin/log.c:1252
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "Е-ПОЩÐ"
-#: builtin/log.c:1250
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "добавÑне на заглавна чаÑÑ‚ „To:“ (до)"
-#: builtin/log.c:1252
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "добавÑне на заглавна чаÑÑ‚ „Cc:“ (и до)"
-#: builtin/log.c:1254
+#: builtin/log.c:1420
msgid "ident"
msgstr "ИДЕÐТИЧÐОСТ"
-#: builtin/log.c:1255
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреÑа в заглавната чаÑÑ‚ „From“ (от) да е тази ИДЕÐТИЧÐОСТ. Ðко "
"не е зададена такава, Ñе взима адреÑа на подаващиÑ"
-#: builtin/log.c:1257
+#: builtin/log.c:1423
msgid "message-id"
msgstr "ИДЕÐТИФИКÐТОР_ÐÐ_СЪОБЩЕÐИЕ"
-#: builtin/log.c:1258
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото Ñъобщение да е в отговор на е-пиÑмото Ñ Ñ‚Ð¾Ð·Ð¸ "
"ИДЕÐТИФИКÐТОР_ÐÐ_СЪОБЩЕÐИЕ"
-#: builtin/log.c:1259 builtin/log.c:1262
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1260
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "прикрепÑне на кръпката"
-#: builtin/log.c:1263
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "включване на кръпката в текÑта на пиÑмата"
-#: builtin/log.c:1267
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-"използване на нишки за ÑъобщениÑта. Стилът е „shallow“ (плитък) или "
+"използване на нишки за ÑъобщениÑта. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1269
+#: builtin/log.c:1435
msgid "signature"
msgstr "подпиÑ"
-#: builtin/log.c:1270
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "добавÑне на поле за подпиÑ"
-#: builtin/log.c:1272
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "БÐЗОВО_ПОДÐÐ’ÐÐЕ"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "добавÑне на необходимото БÐЗово дърво към ÑериÑта кръпки"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "добавÑне на Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ файл"
-#: builtin/log.c:1273
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1362
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "опциите „-n“ и „-k“ Ñа неÑъвмеÑтими."
-#: builtin/log.c:1364
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "опциите „--subject-prefix“ и „-k“ Ñа неÑъвмеÑтими."
-#: builtin/log.c:1372
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "опциÑта „--name-only“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1374
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "опциÑта „--name-status“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1376
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "опциÑта „--check“ е неÑъвмеÑтима Ñ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ на кръпки"
-#: builtin/log.c:1401
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или ÑтандартниÑÑ‚, или да е в директориÑ, но не и двете."
-#: builtin/log.c:1403
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "ДиректориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/log.c:1500
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ðµ може да бъде прочетен"
-#: builtin/log.c:1563
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Изходните файлове не могат да бъдат Ñъздадени"
-#: builtin/log.c:1611
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДÐЛЕЧЕÐ_КЛОР[ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:1665
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7668,106 +8213,151 @@ msgstr ""
"СледениÑÑ‚ отдалечен клон не бе открит, затова изрично задайте "
"ОТДÐЛЕЧЕÐ_КЛОÐ.\n"
-#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Ðепознато подаване „%s“"
-
-#: builtin/ls-files.c:358
+#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФÐЙЛ…]"
-#: builtin/ls-files.c:415
+#: builtin/ls-files.c:427
msgid "identify the file status with tags"
msgstr "извеждане на ÑÑŠÑтоÑнието на файловете Ñ ÐµÐ´Ð½Ð¾Ð±ÑƒÐºÐ²ÐµÐ½Ð¸ флагове"
-#: builtin/ls-files.c:417
+#: builtin/ls-files.c:429
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да Ñе Ñчетат за непроменени"
-#: builtin/ls-files.c:419
+#: builtin/ls-files.c:431
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (Ñтандартно)"
-#: builtin/ls-files.c:421
+#: builtin/ls-files.c:433
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:423
+#: builtin/ls-files.c:435
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:425
+#: builtin/ls-files.c:437
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:427
+#: builtin/ls-files.c:439
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:430
+#: builtin/ls-files.c:442
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за Ñъдържанието на индекÑа"
-#: builtin/ls-files.c:432
+#: builtin/ls-files.c:444
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които Ñ‚Ñ€Ñбва да бъдат изтрити"
-#: builtin/ls-files.c:434
+#: builtin/ls-files.c:446
msgid "show 'other' directories' names only"
msgstr "извеждане Ñамо на името на другите (неÑледените) директории"
-#: builtin/ls-files.c:437
+#: builtin/ls-files.c:448
+msgid "show line endings of files"
+msgstr "извеждане на знаците за край на ред във файловете"
+
+#: builtin/ls-files.c:450
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:440
+#: builtin/ls-files.c:453
msgid "show unmerged files in the output"
msgstr "извеждане на неÑлетите файлове"
# FIXME not clear about what this option does
-#: builtin/ls-files.c:442
+#: builtin/ls-files.c:455
msgid "show resolve-undo information"
msgstr "извеждане на информациÑта за отмÑна на разрешените подаваниÑ"
-#: builtin/ls-files.c:444
+#: builtin/ls-files.c:457
msgid "skip files matching pattern"
msgstr "преÑкачане на файловете напаÑващи ШÐБЛОÐа"
-#: builtin/ls-files.c:447
+#: builtin/ls-files.c:460
msgid "exclude patterns are read from <file>"
msgstr "шаблоните за игнориране да Ñе прочетат от този ФÐЙЛ"
-#: builtin/ls-files.c:450
+#: builtin/ls-files.c:463
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¾Ñ‚ този ФÐЙЛ"
-#: builtin/ls-files.c:452
+#: builtin/ls-files.c:465
msgid "add the standard git exclusions"
msgstr "добавÑне на Ñтандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:455
+#: builtin/ls-files.c:468
msgid "make the output relative to the project top directory"
msgstr "пътищата да Ñа отноÑителни ÑпрÑмо оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° проекта"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:471
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако нÑкой от тези ФÐЙЛове не е в индекÑа"
-#: builtin/ls-files.c:459
+#: builtin/ls-files.c:472
msgid "tree-ish"
msgstr "УКÐЗÐТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:473
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"Ñчитане, че пътищата изтрити Ñлед УКÐЗÐТЕЛÑ_КЪМ_ДЪРВО вÑе още ÑъщеÑтвуват"
-#: builtin/ls-files.c:462
+#: builtin/ls-files.c:475
msgid "show debugging data"
msgstr "извеждане на информациÑта за изчиÑтване на грешки"
+#: builtin/ls-remote.c:7
+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=КОМÐÐДÐ]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ…]]"
+
+#: builtin/ls-remote.c:50
+msgid "do not print remote URL"
+msgstr "без извеждане на адреÑите на отдалечените хранилища"
+
+#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+msgid "exec"
+msgstr "КОМÐÐДÐ"
+
+#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+msgid "path of git-upload-pack on the remote host"
+msgstr "път към командата „git-upload-pack“ на отдалечената машина"
+
+#: builtin/ls-remote.c:56
+msgid "limit to tags"
+msgstr "Ñамо етикетите"
+
+#: builtin/ls-remote.c:57
+msgid "limit to heads"
+msgstr "Ñамо върховете"
+
+#: builtin/ls-remote.c:58
+msgid "do not show peeled tags"
+msgstr "без извеждане на проÑледените етикети"
+
+#: builtin/ls-remote.c:60
+msgid "take url.<base>.insteadOf into account"
+msgstr "взимане предвид на „url.БÐЗÐ.insteadOf“"
+
+#: builtin/ls-remote.c:62
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "изход Ñ ÐºÐ¾Ð´ 2, ако не Ñе откриÑÑ‚ Ñъвпадащи указатели"
+
+#: builtin/ls-remote.c:64
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "извеждане на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð·Ð°ÐµÐ´Ð½Ð¾ Ñ Ð¾Ð±ÐµÐºÑ‚Ð° Ñочен от него"
+
#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [ОПЦИЯ…] УКÐЗÐТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
@@ -7819,175 +8409,179 @@ msgid "git merge --abort"
msgstr "git merge --abort"
# FIXME -m rather than just m
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "опциÑта „-m“ изиÑква ÑтойноÑÑ‚"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "ÐÑма такава ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане: „%s“.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Ðаличните Ñтратегии Ñа:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните Ñтратегии Ñа:"
-#: builtin/merge.c:193 builtin/pull.c:119
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане"
-#: builtin/merge.c:196 builtin/pull.c:122
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на ÑтатиÑтиката Ñлед завършване на Ñливане"
-#: builtin/merge.c:197 builtin/pull.c:125
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(Ñиноним на „--stat“)"
-#: builtin/merge.c:199 builtin/pull.c:128
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавÑне (на макÑимум такъв БРОЙ) запиÑи от ÑÑŠÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ Ð¶ÑƒÑ€Ð½Ð°Ð» в Ñъобщението "
"за подаване"
-#: builtin/merge.c:202 builtin/pull.c:131
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "Ñъздаване на едно подаване вмеÑто извършване на Ñливане"
-#: builtin/merge.c:204 builtin/pull.c:134
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при уÑпешно Ñливане (Ñтандартно дейÑтвие)"
-#: builtin/merge.c:206 builtin/pull.c:137
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "редактиране на Ñъобщението преди подаване"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "позволÑване на тривиално Ñливане (Ñтандартно дейÑтвие)"
-#: builtin/merge.c:209 builtin/pull.c:143
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "преуÑтановÑване, ако Ñливането не е тривиално"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Проверка, че именуваното подаване е Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° GPG"
-#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
-msgstr "ÑтратегиÑ"
+msgstr "СТРÐТЕГИЯ"
-#: builtin/merge.c:215 builtin/pull.c:149
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
-msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане, коÑто да Ñе ползва"
+msgstr "СТРÐТЕГИЯ за Ñливане, коÑто да Ñе ползва"
-#: builtin/merge.c:216 builtin/pull.c:152
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
-msgstr "опциÑ=ÑтойноÑÑ‚"
+msgstr "ОПЦИЯ=СТОЙÐОСТ"
-#: builtin/merge.c:217 builtin/pull.c:153
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
-msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° избраната ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане"
+msgstr "ОПЦИЯ за избраната ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "Ñъобщение при подаването ÑÑŠÑ Ñливане (при нетривиални ÑливаниÑ)"
+msgstr "СЪОБЩЕÐИЕ при подаването ÑÑŠÑ Ñливане (при нетривиални ÑливаниÑ)"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "преуÑтановÑване на текущото Ñливане"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "позволÑване на Ñливане на незавиÑими иÑтории"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "не може да Ñе извърши Ñкатаване"
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "неуÑпешно Ñкатаване"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "неуÑпешно прочитане на обект-дърво"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (нÑма какво да Ñе Ñмачка)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Подаване ÑÑŠÑ Ñмачкване — указателÑÑ‚ „HEAD“ нÑма да бъде обновен\n"
-#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
-#: builtin/merge.c:988
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "„%s“ не може да бъде запиÑан"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "ЗапиÑване на Ñъобщението за Ñмачкване SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Завършване на Ñъобщението за Ñмачкване SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"ЛипÑва Ñъобщение при подаване — указателÑÑ‚ „HEAD“ нÑма да бъде обновен\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не Ñочи към подаване"
-#: builtin/merge.c:537
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ðеправилен низ за наÑтройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:656
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа Ñе Ñамо Ñливане на точно две иÑтории."
-#: builtin/merge.c:670
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Ðепозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° рекурÑивното Ñливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:683
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде запиÑан"
-#: builtin/merge.c:772
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да Ñе чете"
-#: builtin/merge.c:781
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането нÑма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:787
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8002,55 +8596,55 @@ msgstr ""
"Редовете, които започват Ñ â€ž%c“ ще бъдат пропуÑнати, а празно Ñъобщение\n"
"преуÑтановÑва подаването.\n"
-#: builtin/merge.c:811
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Празно Ñъобщение при подаване."
# FIXME - WTF is wonderful.
-#: builtin/merge.c:823
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "ПървиÑÑ‚ етап на тривиалното Ñливане завърши.\n"
-#: builtin/merge.c:878
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "ÐеуÑпешно Ñливане — коригирайте конфликтите и подайте резултата.\n"
-#: builtin/merge.c:894
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "„%s“ не е подаване"
-#: builtin/merge.c:935
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "ÐÑма текущ клон."
-#: builtin/merge.c:937
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "ТекущиÑÑ‚ клон не Ñледи никой."
-#: builtin/merge.c:939
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "ТекущиÑÑ‚ клон не Ñледи никой клон."
-#: builtin/merge.c:944
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ðикой клон не Ñледи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1079
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да Ñе затвори"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ðе може да преуÑтановите Ñливане, защото в момента не Ñе извършва такова "
"(липÑва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8058,7 +8652,7 @@ msgstr ""
"Ðе Ñте завършили Ñливане. (УказателÑÑ‚ „MERGE_HEAD“ ÑъщеÑтвува).\n"
"Подайте промените Ñи, преди да започнете ново Ñливане."
-#: builtin/merge.c:1229
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8066,111 +8660,115 @@ msgstr ""
"Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n"
"ÑъщеÑтвува). Подайте промените Ñи, преди да започнете ново Ñливане."
-#: builtin/merge.c:1232
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Ðе Ñте завършили отбиране на подаване (указателÑÑ‚ „CHERRY_PICK_HEAD“\n"
"ÑъщеÑтвува)."
-#: builtin/merge.c:1241
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "ОпциÑта „--squash“ е неÑъвмеÑтима Ñ â€ž--no-ff“."
-#: builtin/merge.c:1249
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Ðе е указано подаване и наÑтройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1266
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "Подаване ÑÑŠÑ Ñмачкване във връх без иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð²Ñе още не Ñе поддържа"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без иÑториÑ, вÑички ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ñа тривиални, не може да Ñе "
"извърши нетривиално Ñливане изиÑквано от опциÑта „--no-ff“"
-#: builtin/merge.c:1274
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да Ñе Ñлее"
-#: builtin/merge.c:1276
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да Ñлеете точно едно подаване във връх без иÑториÑ"
-#: builtin/merge.c:1331
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е Ñ Ð½ÐµÐ´Ð¾Ð²ÐµÑ€ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1334
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1337
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG."
-#: builtin/merge.c:1340
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е Ñ ÐºÐ¾Ñ€ÐµÐºÑ‚ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð¾Ñ‚ GPG на „%s“.\n"
-#: builtin/merge.c:1423
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "незавиÑими иÑтории не може да Ñе ÑлеÑÑ‚"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "ОбновÑване „%s..%s“\n"
-#: builtin/merge.c:1460
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба Ñ Ð½Ð°Ð¹-тривиалното Ñливане в рамките на индекÑа…\n"
# FIXME WTF message
-#: builtin/merge.c:1467
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "ÐеуÑпешно Ñливане.\n"
-#: builtin/merge.c:1499
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr ""
"Ðе може да Ñе извърши тривиално Ñливане, преуÑтановÑване на дейÑтвието."
-#: builtin/merge.c:1522 builtin/merge.c:1601
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1526
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване ÑÑŠÑ ÑтратегиÑта за Ñливане „%s“…\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "ÐÐ¸ÐºÐ¾Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° Ñливане не може да извърши Ñливането.\n"
-#: builtin/merge.c:1594
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "ÐеуÑпешно Ñливане ÑÑŠÑ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ â€ž%s“.\n"
-#: builtin/merge.c:1603
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва Ñе ÑтратегиÑта „%s“, коÑто ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1615
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8258,19 +8856,19 @@ msgstr "без Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ конфликти"
msgid "set labels for file1/orig-file/file2"
msgstr "задаване на етикети за ФÐЙЛ_1/ОРИГИÐÐЛ/ФÐЙЛ_2"
-#: builtin/mktree.c:64
+#: builtin/mktree.c:65
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/mktree.c:150
+#: builtin/mktree.c:152
msgid "input is NUL terminated"
msgstr "входните запиÑи Ñа разделени Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“"
-#: builtin/mktree.c:151 builtin/write-tree.c:24
+#: builtin/mktree.c:153 builtin/write-tree.c:24
msgid "allow missing objects"
msgstr "разрешаване на липÑващи обекти"
-#: builtin/mktree.c:152
+#: builtin/mktree.c:154
msgid "allow creation of more than one tree"
msgstr "разрешаване на Ñъздаването на повече от едно дърво"
@@ -8278,138 +8876,136 @@ msgstr "разрешаване на Ñъздаването на повече оÑ
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
-# FIXME message<
-#: builtin/mv.c:69
+#: builtin/mv.c:70
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "ДиректориÑта „%s“ е в индекÑа, но не е подмодул"
-#: builtin/mv.c:71
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекÑа,\n"
"или ги Ñкатайте"
-# FIXME message
-#: builtin/mv.c:89
+#: builtin/mv.c:90
#, c-format
msgid "%.*s is in index"
msgstr "„%.*s“ вече е в индекÑа"
-#: builtin/mv.c:111
+#: builtin/mv.c:112
msgid "force move/rename even if target exists"
msgstr "принудително премеÑтване/преименуване дори целта да ÑъщеÑтвува"
-#: builtin/mv.c:112
+#: builtin/mv.c:113
msgid "skip move/rename errors"
msgstr "преÑкачане на грешките при премеÑтване/преименуване"
-#: builtin/mv.c:151
+#: builtin/mv.c:152
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ ÑъщеÑтвува и не е директориÑ"
-#: builtin/mv.c:162
+#: builtin/mv.c:163
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:166
+#: builtin/mv.c:167
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:169
+#: builtin/mv.c:170
msgid "can not move directory into itself"
msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да Ñе премеÑти в Ñебе Ñи"
-#: builtin/mv.c:172
+#: builtin/mv.c:173
msgid "cannot move directory over file"
msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да Ñе премеÑти върху файл"
-#: builtin/mv.c:181
+#: builtin/mv.c:182
msgid "source directory is empty"
msgstr "първоначалната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ðµ празна"
-#: builtin/mv.c:206
+#: builtin/mv.c:207
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:209
+#: builtin/mv.c:210
msgid "destination exists"
msgstr "целта ÑъщеÑтвува"
-#: builtin/mv.c:217
+#: builtin/mv.c:218
#, c-format
msgid "overwriting '%s'"
msgstr "презапиÑване на „%s“"
-#: builtin/mv.c:220
+#: builtin/mv.c:221
msgid "Cannot overwrite"
msgstr "ПрезапиÑването е невъзможно"
-#: builtin/mv.c:223
+#: builtin/mv.c:224
msgid "multiple sources for the same target"
msgstr "множеÑтво източници за една цел"
-#: builtin/mv.c:225
+#: builtin/mv.c:226
msgid "destination directory does not exist"
msgstr "целевата Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ ÑъщеÑтвува"
-#: builtin/mv.c:232
+#: builtin/mv.c:233
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:253
+#: builtin/mv.c:254
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "неуÑпешно преименуване на „%s“"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДÐÐ’ÐÐЕ…"
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
# FIXME sha
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "извеждане Ñамо на имената (без Ñумите по SHA1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "използване Ñамо на етикетите за именуване на подаваниÑта"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
-msgstr "използване Ñамо на шаблоните напаÑващи на ШÐБЛОÐа"
+msgstr "използване Ñамо на указателите напаÑващи на ШÐБЛОÐа"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на вÑички подаваниÑ, които могат да бъдат доÑтигнати от вÑички "
"указатели"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "четене от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "да Ñе извеждат и недефинираните имена (Ñтандартна ÑтойноÑÑ‚ на опциÑта)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
@@ -8557,24 +9153,16 @@ msgstr "обектът-бележка не може да бъде запиÑан
msgid "The note contents have been left in %s"
msgstr "Съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
-#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
-#: builtin/notes.c:877 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Ðе може да Ñе открие към какво Ñочи „%s“."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8586,42 +9174,42 @@ msgid "Cannot read note data from non-blob object '%s'."
msgstr ""
"Съдържанието на бележка не може да Ñе вземе от обект, който не е BLOB: „%s“."
-#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
-#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
-#: builtin/notes.c:942
+#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
+#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "прекалено много параметри"
-#: builtin/notes.c:372 builtin/notes.c:659
+#: builtin/notes.c:375 builtin/notes.c:662
#, c-format
msgid "No note found for object %s."
msgstr "ÐÑма бележки за обекта „%s“."
-#: builtin/notes.c:393 builtin/notes.c:556
+#: builtin/notes.c:396 builtin/notes.c:559
msgid "note contents as a string"
msgstr "низ, който е Ñъдържанието на бележката"
-#: builtin/notes.c:396 builtin/notes.c:559
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "note contents in a file"
-msgstr "файл ÑÑŠÑ Ñъдържанието на бележката"
+msgstr "ФÐЙЛ ÑÑŠÑ Ñъдържанието на бележката"
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "reuse and edit specified note object"
-msgstr "преизползване и редактиране на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка"
+msgstr "преизползване и редактиране на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐžÐ‘Ð•ÐšÐ¢-бележка"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "reuse specified note object"
-msgstr "преизползване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-бележка"
+msgstr "преизползване на ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐžÐ‘Ð•ÐšÐ¢-бележка"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:406 builtin/notes.c:477
+#: builtin/notes.c:409 builtin/notes.c:480
msgid "replace existing notes"
msgstr "замÑна на ÑъщеÑтвуващите бележки"
-#: builtin/notes.c:431
+#: builtin/notes.c:434
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8630,32 +9218,32 @@ msgstr ""
"Ðе може да Ñе добави бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. "
"Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки."
-#: builtin/notes.c:446 builtin/notes.c:525
+#: builtin/notes.c:449 builtin/notes.c:528
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "ПрезапиÑване на ÑъщеÑтвуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:478
+#: builtin/notes.c:481
msgid "read objects from stdin"
msgstr "изчитане на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
# FIXME imporve message
-#: builtin/notes.c:480
+#: builtin/notes.c:483
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на наÑтройките за КОМÐÐДÐта, коÑто презапиÑва Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ (включва "
"опциÑта „--stdin“)"
-#: builtin/notes.c:498
+#: builtin/notes.c:501
msgid "too few parameters"
msgstr "прекалено малко параметри"
-#: builtin/notes.c:519
+#: builtin/notes.c:522
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -8664,14 +9252,14 @@ msgstr ""
"Ðе може да Ñе копира бележка, защото такава вече ÑъщеÑтвува за обекта „%s“. "
"Използвайте опциÑта „-f“, за да презапишете ÑъщеÑтвуващи бележки."
-#: builtin/notes.c:531
+#: builtin/notes.c:534
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
"Ðе може да Ñе копира бележка, коÑто не ÑъщеÑтвува — нÑма бележки за обекта-"
"източник „%s“."
-#: builtin/notes.c:583
+#: builtin/notes.c:586
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -8682,67 +9270,67 @@ msgstr ""
"ВмеÑто това ги използвайте Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:764
+#: builtin/notes.c:768
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:766
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Опции при Ñливане"
-#: builtin/notes.c:768
+#: builtin/notes.c:772
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:770
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "Подаване на неÑлети бележки"
-#: builtin/notes.c:772
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на Ñливането чрез подаване на неÑлети бележки"
-#: builtin/notes.c:774
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "ПреуÑтановÑване на корекциÑта при Ñливането на бележки"
-#: builtin/notes.c:776
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "преуÑтановÑване на Ñливането на бележки"
-#: builtin/notes.c:853
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Ð’ момента Ñе извършва Ñливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:880
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "ÐÑма бележки за обекта „%s“\n"
-#: builtin/notes.c:892
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на неÑъщеÑтвуваща бележка не Ñе Ñчита за грешка"
-#: builtin/notes.c:895
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/notes.c:976
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:977
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "да Ñе използва бележката Ñочена от този УКÐЗÐТЕЛ_ЗÐ_БЕЛЕЖКÐ"
-#: builtin/notes.c:1012 builtin/remote.c:1647
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Ðепозната подкоманда: %s"
@@ -8766,181 +9354,187 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "грешка при декомпреÑиране Ñ â€ždeflate“ (%d)"
-#: builtin/pack-objects.c:771
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"изключване на запиÑването на битовата маÑка, пакетите Ñа разделени поради "
+"ÑтойноÑтта на „pack.packSizeLimit“"
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr "ЗапиÑване на обектите"
-#: builtin/pack-objects.c:1011
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на запиÑването на битовата маÑка, защото нÑкои обекти нÑма да Ñе "
"пакетират"
-#: builtin/pack-objects.c:2171
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "КомпреÑиране на обектите"
-#: builtin/pack-objects.c:2568
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана верÑÐ¸Ñ Ð½Ð° индекÑа „%s“"
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна верÑÐ¸Ñ Ð½Ð° индекÑа „%s“"
-#: builtin/pack-objects.c:2602
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:2609
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"Ñъщото дейÑтвие като опциÑта „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "ВЕРСИЯ[,ОТМЕСТВÐÐЕ]"
-#: builtin/pack-objects.c:2611
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекÑа на пакетните файлове във форма̀та Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð°Ñ‚Ð° верÑиÑ"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "макÑимален размер на вÑеки пакетен файл"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет оÑвен по брой обекти"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"макÑимална дължина на веригата от разлики, коÑто е позволена в Ð¿Ð°ÐºÐµÑ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "преизползване на ÑъщеÑтвуващите разлики"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "преизползване на ÑъщеÑтвуващите обекти"
-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr ""
"Ñтартиране на нишки за претърÑване на най-добрите ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð° разликите"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "без Ñъздаване на празен пакетен файл"
-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "изчитане на верÑиите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до вÑе още непакетираните обекти"
-#: builtin/pack-objects.c:2641
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr ""
"включване на вÑички обекти, които могат да Ñе доÑтигнат от произволен "
"указател"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите Ñочени от запиÑите в журнала на указателите"
-#: builtin/pack-objects.c:2647
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "включване и на обектите Ñочени от индекÑа"
-#: builtin/pack-objects.c:2650
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "извеждане на пакета на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´"
-#: builtin/pack-objects.c:2652
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които Ñочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2654
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "запазване на недоÑтижимите обекти"
-#: builtin/pack-objects.c:2655 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недоÑтижимите обекти, които Ñа по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "Ñъздаване на Ñъкратени пакети"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходÑщо за плитко доÑтавÑне"
-#: builtin/pack-objects.c:2663
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които Ñа придружени от файл „.keep“"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "ниво на компреÑиране при пакетиране"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на вÑички родители — дори и тези, които нормално Ñа Ñкрити при "
"приÑажданиÑта"
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на ÑъщеÑтвуващи индекÑи на база битови маÑки за уÑкорÑване на "
"преброÑването на обектите"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база побитова маÑка, заедно Ñ Ð¸Ð½Ð´ÐµÐºÑа за пакета"
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "ПреброÑване на обектите"
@@ -8968,15 +9562,15 @@ msgstr "Изтриване на повтарÑщите Ñе обекти"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "Ñамо извеждане без дейÑтвително окаÑÑ‚Ñ€Ñне"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° окаÑтрените обекти"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "окаÑÑ‚Ñ€Ñне на обектите по-Ñтари от това ВРЕМЕ"
@@ -8984,52 +9578,60 @@ msgstr "окаÑÑ‚Ñ€Ñне на обектите по-Ñтари от това Ð
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище Ñ Ð²Ð°Ð¶Ð½Ð¸ обекти не може да Ñе окаÑÑ‚Ñ€Ñ"
-#: builtin/pull.c:69
+#: builtin/pull.c:72
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ_ÐÐ_ВЕРСИЯ…]]"
-#: builtin/pull.c:113
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Опции при Ñливане"
-#: builtin/pull.c:116
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "внаÑÑне на промените чрез пребазиране, а не чрез Ñливане"
-#: builtin/pull.c:140 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "позволÑване на тривиални ÑливаниÑ"
-#: builtin/pull.c:146
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "Проверка, че указаното подаване е Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ Ð½Ð° GPG"
-#: builtin/pull.c:160
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "автоматично Ñкатаване/прилагане на Ñкатаното преди и Ñлед пребазиране"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Опции при доÑтавÑне"
-#: builtin/pull.c:268
+#: builtin/pull.c:194
+msgid "number of submodules pulled in parallel"
+msgstr "брой подмодули издърпани паралелно"
+
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ðеправилна ÑтойноÑÑ‚ за „pull.ff“: „%s“"
-#: builtin/pull.c:352
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Ðе можете да издърпвате при това пребазиране, защото има промени, които не "
"Ñа в индекÑа"
-#: builtin/pull.c:358
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "ОÑвен това в индекÑа има неподадени промени."
-#: builtin/pull.c:360
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Ðе можете да издърпвате при това пребазиране, защото в индекÑа има "
"неподадени промени."
-#: builtin/pull.c:436
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9037,14 +9639,14 @@ msgstr ""
"Между указателите, които току що доÑтавихте, нÑма подходÑщ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:438
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доÑтавихте, нÑма подходÑщ кандидат, който "
"да Ñлеете."
-#: builtin/pull.c:439
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9052,7 +9654,7 @@ msgstr ""
"Ðай вероÑтно Ñте подали шаблон за указатели, който не е напаÑнал Ñ Ð½Ð¸Ñ‰Ð¾ в "
"отдалеченото хранилище."
-#: builtin/pull.c:442
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9063,40 +9665,44 @@ msgstr ""
"Понеже това не е хранилището по подразбиране на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½, Ñ‚Ñ€Ñбва\n"
"да укажете Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ на ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´."
-#: builtin/pull.c:447
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Извън вÑички клони."
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон иÑкате да пребазирате."
-#: builtin/pull.c:451 builtin/pull.c:466
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон иÑкате да Ñлеете."
-#: builtin/pull.c:452 builtin/pull.c:467
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ ръководÑтвото „git-pull(1)“"
-#: builtin/pull.c:462
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "ОТДÐЛЕЧЕÐО_ХРÐÐИЛИЩЕ"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "КЛОÐ"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "ТекущиÑÑ‚ клон не Ñледи никой."
-#: builtin/pull.c:471
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Ðко вÑе пак иÑкате да зададете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñледен клон,\n"
-"можете да направите това Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n"
-"\n"
-" git branch --set-upstream-to=%s/СЛЕДЕÐ_КЛОР%s\n"
-"\n"
+"Ðко иÑкате да зададете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ñледен клон, можете да направите това Ñ "
+"командата:"
-#: builtin/pull.c:476
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9105,11 +9711,15 @@ msgstr ""
"За Ñливане е указан отдалечениÑÑ‚ указател „%s“,\n"
"но такъв не е доÑтавен."
-#: builtin/pull.c:830
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "опциÑта „--[no-]autostash“ изиÑква „--rebase“"
+
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr "ОбновÑване на вÑе още неÑъздаден клон Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ от индекÑа"
-#: builtin/pull.c:859
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9119,7 +9729,7 @@ msgstr ""
"доÑтавÑнето обнови върха на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½. Работното\n"
"ви копие бе тривиално ÑлÑто от подаване „%s“."
-#: builtin/pull.c:864
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9136,11 +9746,11 @@ msgstr ""
" $ git reset --hard\n"
"за връщане към нормално ÑÑŠÑтоÑние."
-#: builtin/pull.c:879
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "Ðе може да Ñливате множеÑтво клони в празен върхов указател."
-#: builtin/pull.c:883
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Ðе може да пребазирате върху повече от един клон."
@@ -9148,15 +9758,15 @@ msgstr "Ðе може да пребазирате върху повече от Ð
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ_ÐÐ_ВЕРСИЯ…]]"
-#: builtin/push.c:88
+#: builtin/push.c:89
msgid "tag shorthand without <tag>"
msgstr "Ñъкращение за етикет без ЕТИКЕТ"
-#: builtin/push.c:98
+#: builtin/push.c:99
msgid "--delete only accepts plain target ref names"
msgstr "опциÑта „--delete“ приема за цел Ñамо проÑти имена на указатели"
-#: builtin/push.c:142
+#: builtin/push.c:143
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -9165,7 +9775,7 @@ msgstr ""
"За да включите тази Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° поÑтоÑнно, погледнете документациÑта за "
"наÑтройката „push.default“ в „git help config“."
-#: builtin/push.c:145
+#: builtin/push.c:146
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -9190,7 +9800,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:160
+#: builtin/push.c:161
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -9204,7 +9814,7 @@ msgstr ""
"\n"
" git push %s HEAD:ИМЕ_ÐÐ_ОТДÐЛЕЧЕÐИЯ_КЛОÐ\n"
-#: builtin/push.c:174
+#: builtin/push.c:175
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -9218,14 +9828,14 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:182
+#: builtin/push.c:183
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"ТекущиÑÑ‚ клон „%s“ Ñледи нÑколко отдалечени клона, не можете проÑто да "
"изтлаÑкате."
-#: builtin/push.c:185
+#: builtin/push.c:186
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -9237,67 +9847,14 @@ msgstr ""
"ТрÑбва да укажете ÐºÐ¾Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð´Ð° Ñе изтлаÑка, за обновÑване на Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ "
"клон."
-#: builtin/push.c:208
-msgid ""
-"push.default is unset; its implicit value has changed in\n"
-"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-"and maintain the traditional behavior, use:\n"
-"\n"
-" git config --global push.default matching\n"
-"\n"
-"To squelch this message and adopt the new behavior now, use:\n"
-"\n"
-" git config --global push.default simple\n"
-"\n"
-"When push.default is set to 'matching', git will push local branches\n"
-"to the remote branches that already exist with the same name.\n"
-"\n"
-"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-"behavior, which only pushes the current branch to the corresponding\n"
-"remote branch that 'git pull' uses to update the current branch.\n"
-"\n"
-"See 'git help config' and search for 'push.default' for further "
-"information.\n"
-"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-"'current' instead of 'simple' if you sometimes use older versions of Git)"
-msgstr ""
-"ÐаÑтройката „push.default“ не е зададена. СтойноÑтта Ñ Ð¿Ð¾ подразбиране е "
-"Ñменена\n"
-"в Git 2.0 от „matching“ (вÑички Ñъвпадащи клони) на „simple“ (Ñамо текущиÑ\n"
-"клон). За да подтиÑнете това Ñъобщение и да използвате традиционното "
-"поведение\n"
-"на Git 1.x, изпълнете командата:\n"
-"\n"
-" git config --global push.default matching\n"
-"\n"
-"За да подтиÑнете това Ñъобщение и да използвате новото поведение на Git 2."
-"x,\n"
-"изпълнете командата:\n"
-"\n"
-" git config --global push.default simple\n"
-"\n"
-"Когато наÑтройката „push.default“ е „matching“, git ще изтлаÑка вÑички "
-"локални\n"
-"клони, които имат отдалечен аналог ÑÑŠÑ Ñъщото име.\n"
-"\n"
-"От верÑÐ¸Ñ 2.0 Git Ñтандартно започва да ползва по-конÑÐµÑ€Ð²Ð°Ñ‚Ð¸Ð²Ð½Ð¸Ñ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚\n"
-"„simple“, при който „push“ изтлаÑква Ñамо Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ ÐºÐ»Ð¾Ð½ към отдалечениÑ, "
-"Ñледен\n"
-"клон — ÑъщиÑ, който „git pull“ използва, за да обнови текущиÑ.\n"
-"\n"
-"За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ „git help config“ и потърÑете „push."
-"default“.\n"
-"Ðовата ÑтойноÑÑ‚ „simple“ бе въведена Ñ Ð²ÐµÑ€ÑÐ¸Ñ 1.7.11 на Git. Ðко понÑкога\n"
-"ползвате Ñтари верÑии на Git, задайте ÑтойноÑÑ‚ „current“ вмеÑто „simple“."
-
-#: builtin/push.c:275
+#: builtin/push.c:242
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Ðе Ñте указали верÑÐ¸Ñ Ð·Ð° подаване, а наÑтройката „push.default“ е "
"„nothing“ (нищо без изрично указана верÑÐ¸Ñ Ð´Ð° не Ñе изтлаÑква)"
-#: builtin/push.c:282
+#: builtin/push.c:249
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -9311,7 +9868,7 @@ msgstr ""
"преди отново да изтлаÑкате промените. За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¸Ð¶Ñ‚Ðµ раздела\n"
"„Note about fast-forwards“ в Ñтраницата от ръководÑтвото „git push --help“."
-#: builtin/push.c:288
+#: builtin/push.c:255
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"
@@ -9324,7 +9881,7 @@ msgstr ""
"Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ раздела „Note about fast-forwards“ в Ñтраницата от\n"
"ръководÑтвото „git push --help“."
-#: builtin/push.c:294
+#: builtin/push.c:261
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"
@@ -9343,14 +9900,14 @@ msgstr ""
"Ñтраницата\n"
"от ръководÑтвото „git push --help“."
-#: builtin/push.c:301
+#: builtin/push.c:268
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"ИзтлаÑкването е отхвърлено, защото в отдалеченото хранилище ÑъщеÑтвува "
"етикет,\n"
"който ще припокриете Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ от вашето хранилище."
-#: builtin/push.c:304
+#: builtin/push.c:271
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"
@@ -9360,22 +9917,22 @@ msgstr ""
"указател, който вече Ñочи към обект, който не е подаване, както и тепърва\n"
"да го промените да Ñочи към подобен обект.\n"
-#: builtin/push.c:363
+#: builtin/push.c:331
#, c-format
msgid "Pushing to %s\n"
msgstr "ИзтлаÑкване към „%s“\n"
-#: builtin/push.c:367
+#: builtin/push.c:335
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "чаÑÑ‚ от указателите не бÑха изтлаÑкани към „%s“"
-#: builtin/push.c:397
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:398
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9397,108 +9954,104 @@ msgstr ""
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:413
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:414
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr "опциÑта „--all“ е неÑъвмеÑтима Ñ ÑƒÐºÐ°Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ на верÑиÑ"
-#: builtin/push.c:419
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:420
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr "опциÑта „--mirror“ е неÑъвмеÑтима Ñ ÑƒÐºÐ°Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ на верÑиÑ"
-#: builtin/push.c:425
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ Ñа неÑъвмеÑтими"
-#: builtin/push.c:537
+#: builtin/push.c:505
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:538 builtin/send-pack.c:161
+#: builtin/push.c:506 builtin/send-pack.c:161
msgid "push all refs"
msgstr "изтлаÑкване на вÑички указатели"
-#: builtin/push.c:539 builtin/send-pack.c:163
+#: builtin/push.c:507 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "огледално копие на вÑички указатели"
-#: builtin/push.c:541
+#: builtin/push.c:509
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:542
+#: builtin/push.c:510
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтлаÑкване на етикетите (неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“ и „--mirror“)"
-#: builtin/push.c:545 builtin/send-pack.c:164
+#: builtin/push.c:513 builtin/send-pack.c:164
msgid "force updates"
msgstr "принудително обновÑване"
# FIXME double check this
-#: builtin/push.c:547 builtin/send-pack.c:175
+#: builtin/push.c:515 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "УКÐЗÐТЕЛ>:<ОЧÐКВÐÐÐ_СТОЙÐОСТ"
-#: builtin/push.c:548 builtin/send-pack.c:176
+#: builtin/push.c:516 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "УКÐЗÐТЕЛÑÑ‚ Ñ‚Ñ€Ñбва първоначално да е Ñ Ñ‚Ð°Ð·Ð¸ ОЧÐКВÐÐÐ_СТОЙÐОСТ"
-#: builtin/push.c:550
-msgid "check|on-demand|no"
-msgstr "„check“ (проверка), „on-demand“ (при нужда) или „no“ (без)"
-
-#: builtin/push.c:551
+#: builtin/push.c:519
msgid "control recursive pushing of submodules"
msgstr "управление на рекурÑивното изтлаÑкване на подмодулите"
-#: builtin/push.c:553 builtin/send-pack.c:169
+#: builtin/push.c:521 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "използване на Ñъкратени пакети"
-#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
+#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:556
+#: builtin/push.c:524
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:559
+#: builtin/push.c:527
msgid "prune locally removed refs"
msgstr "окаÑÑ‚Ñ€Ñне на указателите, които Ñа премахнати от локалното хранилище"
-#: builtin/push.c:561
+#: builtin/push.c:529
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтлаÑкване (pre-push)"
-#: builtin/push.c:562
+#: builtin/push.c:530
msgid "push missing but relevant tags"
msgstr ""
"изтлаÑкване на липÑващите в отдалеченото хранилище, но Ñвързани Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¾Ñ‚Ð¾ "
"изтлаÑкване, етикети"
-#: builtin/push.c:565 builtin/send-pack.c:166
+#: builtin/push.c:533 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "подпиÑване на изтлаÑкването Ñ GPG"
-#: builtin/push.c:567 builtin/send-pack.c:170
+#: builtin/push.c:535 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "изиÑкване на атомарни операции от отÑрещната Ñтрана"
-#: builtin/push.c:577
+#: builtin/push.c:549
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опциÑта „--delete“ е неÑъвмеÑтима Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:579
+#: builtin/push.c:551
msgid "--delete doesn't make sense without any refs"
msgstr "опциÑта „--delete“ изиÑква поне един указател на верÑиÑ"
@@ -9577,13 +10130,24 @@ msgstr "без прилагане на филтъра за чаÑтично из
msgid "debug unpack-trees"
msgstr "изчиÑтване на грешки в командата „unpack-trees“"
-# FIXME
-#: builtin/reflog.c:428
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack ДИРЕКТОРИЯ_ÐÐ_GIT"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "без извеждане на информациÑ"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "ТрÑбва да укажете директориÑ."
+
+#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време за „%s“"
-#: builtin/reflog.c:545 builtin/reflog.c:550
+#: builtin/reflog.c:540 builtin/reflog.c:545
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна ÑтойноÑÑ‚ за време"
@@ -9730,56 +10294,46 @@ msgstr ""
"указването на Ñледени клони е ÑмиÑлено Ñамо за отдалечени хранилища, от "
"които Ñе доÑтавÑ"
-#: builtin/remote.c:193 builtin/remote.c:643
+#: builtin/remote.c:190 builtin/remote.c:633
#, c-format
msgid "remote %s already exists."
msgstr "вече ÑъщеÑтвува отдалечено хранилище Ñ Ð¸Ð¼Ðµ „%s“."
-#: builtin/remote.c:197 builtin/remote.c:647
+#: builtin/remote.c:194 builtin/remote.c:637
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
-#: builtin/remote.c:241
+#: builtin/remote.c:234
#, c-format
msgid "Could not setup master '%s'"
msgstr "ОÑновниÑÑ‚ клон „%s“ не може да бъде наÑтроен"
-#: builtin/remote.c:341
+#: builtin/remote.c:336
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Обектите за доÑтавÑне за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s“ не могат да бъдат получени"
-#: builtin/remote.c:442 builtin/remote.c:450
+#: builtin/remote.c:437 builtin/remote.c:445
msgid "(matching)"
msgstr "(Ñъвпадащи)"
-#: builtin/remote.c:454
+#: builtin/remote.c:449
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
-#, c-format
-msgid "Could not append '%s' to '%s'"
-msgstr "„%s“ не може да Ñе добави към „%s“"
-
-#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
+#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Такова отдалечено хранилище нÑма: %s"
-#: builtin/remote.c:653
+#: builtin/remote.c:643
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в наÑтройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:659 builtin/remote.c:827
-#, c-format
-msgid "Could not remove config section '%s'"
-msgstr "Разделът „%s“ в наÑтройките не може да бъде изтрит"
-
# FIXME tabulator
-#: builtin/remote.c:674
+#: builtin/remote.c:663
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -9790,27 +10344,17 @@ msgstr ""
" %s\n"
" Променете наÑтройките ръчно, ако е необходимо."
-#: builtin/remote.c:680
-#, c-format
-msgid "Could not append '%s'"
-msgstr "Разделът „%s“ не може да бъде добавен в наÑтройките"
-
-#: builtin/remote.c:691
-#, c-format
-msgid "Could not set '%s'"
-msgstr "Разделът „%s“ не може да бъде зададен в наÑтройките"
-
-#: builtin/remote.c:713
+#: builtin/remote.c:699
#, c-format
msgid "deleting '%s' failed"
msgstr "неуÑпешно изтриване на „%s“"
-#: builtin/remote.c:747
+#: builtin/remote.c:733
#, c-format
msgid "creating '%s' failed"
msgstr "неуÑпешно Ñъздаване на „%s“"
-#: builtin/remote.c:813
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -9824,125 +10368,132 @@ msgstr[1] ""
"Бележка: ÐÑколко клона извън йерархиÑта „refs/remotes/“ не бÑха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:928
+#: builtin/remote.c:810
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Разделът „%s“ в наÑтройките не може да бъде изтрит"
+
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (Ñледващото доÑтавÑне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:931
+#: builtin/remote.c:914
msgid " tracked"
msgstr " Ñледен"
-#: builtin/remote.c:933
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " Ñтар (изтрийте чрез „git remote prune“)"
# FIXME
-#: builtin/remote.c:935
+#: builtin/remote.c:918
msgid " ???"
msgstr " неÑÑно ÑÑŠÑтоÑние"
# CHECK
-#: builtin/remote.c:976
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за Ñливане „%s“. Ðевъзможно е да пребазирате върху повече от "
"1 клон"
-#: builtin/remote.c:983
+#: builtin/remote.c:967
#, c-format
-msgid "rebases onto remote %s"
-msgstr "пребазиране върху Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
+msgid "rebases interactively onto remote %s"
+msgstr "интерактивно пребазиране върху Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:986
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:987
+#: builtin/remote.c:972
msgid " and with remote"
msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/remote.c:989
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "Ñливане Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½ „%s“"
-#: builtin/remote.c:990
+#: builtin/remote.c:975
msgid " and with remote"
msgstr " и Ñ Ð¾Ñ‚Ð´Ð°Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¾Ð½"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1021
msgid "create"
msgstr "Ñъздаден"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1024
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1028
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1031
msgid "fast-forwardable"
msgstr "може да Ñе Ñлее тривиално"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1034
msgid "local out of date"
msgstr "локалниÑÑ‚ е изоÑтанал"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1041
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтлаÑква към %-*s (%s)"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1044
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтлаÑква към %-*s (%s)"
-#: builtin/remote.c:1063
+#: builtin/remote.c:1048
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтлаÑква към %s"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1051
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтлаÑква към %s"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1119
msgid "do not query remotes"
msgstr "без заÑвки към отдалечените хранилища"
-#: builtin/remote.c:1161
+#: builtin/remote.c:1146
#, c-format
msgid "* remote %s"
msgstr "◠отдалечено хранилище „%s“"
-#: builtin/remote.c:1162
+#: builtin/remote.c:1147
#, c-format
msgid " Fetch URL: %s"
msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° доÑтавÑне: %s"
-#: builtin/remote.c:1163 builtin/remote.c:1314
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(без адреÑ)"
# FIXME spaces betwen Push and URL
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° изтлаÑкване: %s"
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " клон Ñочен от HEAD: %s"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9951,159 +10502,159 @@ msgstr ""
"хранилище е\n"
" нееднозначен и е нÑкой от Ñледните):\n"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1197 builtin/remote.c:1224
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (ÑÑŠÑтоÑнието не бе проверено)"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1193
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:1214
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренеÑени чрез „ push“"
-#: builtin/remote.c:1221
+#: builtin/remote.c:1208
#, 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:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD Ñпоред отдалеченото хранилище"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Ðе може да Ñе уÑтанови отдалечениÑÑ‚ връх"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"МножеÑтво клони Ñ Ð²ÑŠÑ€Ñ…Ð¾Ð²Ðµ. Изберете изрично нÑкой от Ñ‚ÑÑ… чрез командата:"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1279
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Ðеправилен указател: %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да Ñе наÑтрои"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще Ñе превърне в обект извън клоните!"
-#: builtin/remote.c:1300
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ Ñе превърна в обект извън клоните!"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "ОкаÑÑ‚Ñ€Ñне на „%s“"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "адреÑ: %s"
-#: builtin/remote.c:1327
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " â— [ще бъде окаÑтрено] %s"
-#: builtin/remote.c:1330
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " â— [окаÑтрено] %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "окаÑÑ‚Ñ€Ñне на огледалата на отдалечените хранилища Ñлед доÑтавÑне"
-#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "ÐÑма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "добавÑне на клон"
-#: builtin/remote.c:1468
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1485
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адреÑите за изтлаÑкване, а не за доÑтавÑне"
-#: builtin/remote.c:1487
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "извеждане на вÑички адреÑи"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище „%s“"
-#: builtin/remote.c:1541
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "промÑна на адреÑите за изтлаÑкване"
-#: builtin/remote.c:1543
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "добавÑне на адреÑи"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "изтриване на адреÑи"
# FIXME message - incompatible
-#: builtin/remote.c:1552
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ Ñа неÑъвмеÑтими"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Ðеправилен (Ñтар) формат за адреÑ: %s"
-#: builtin/remote.c:1600
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв Ð°Ð´Ñ€ÐµÑ Ð½Ðµ е открит: %s"
# FIXME CHECK MEANING
-#: builtin/remote.c:1602
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Ðикой от адреÑите, които не Ñа за изтлаÑкване, нÑма да Ñе изтрие"
-#: builtin/remote.c:1616
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробноÑти. ПоÑÑ‚Ð°Ð²Ñ Ñе пред подкоманда"
@@ -10419,7 +10970,7 @@ msgstr "ИндекÑÑŠÑ‚ не може да бъде занулен към веÑ
msgid "Could not write new index file."
msgstr "ÐовиÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може да бъде запиÑан."
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:350
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
@@ -10634,12 +11185,6 @@ msgstr ""
"изходниÑÑ‚ код да е 0, дори ако никой файл нe e напаÑнал Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° за "
"изтриване"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекÑа,\n"
-"или ги Ñкатайте"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10681,29 +11226,24 @@ msgstr "извеждане на ÑÑŠÑтоÑнието от отдалечена
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [ОПЦИЯ…] [ДИÐПÐЗОÐ_ÐÐ_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
-#: builtin/shortlog.c:131
-#, c-format
-msgid "Missing author: %s"
-msgstr "Ðвторът липÑва: %s"
-
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:242
msgid "sort output according to the number of commits per author"
msgstr "подредба на подаваниÑта по Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ автор"
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:244
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Без опиÑÐ°Ð½Ð¸Ñ Ð½Ð° подаваниÑта — да Ñе показва Ñамо Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ"
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:246
msgid "Show the email address of each author"
msgstr "Извеждане на адреÑа на е-поща за вÑеки автор"
# FIXME why is this so short
-#: builtin/shortlog.c:235
+#: builtin/shortlog.c:247
msgid "w[,i1[,i2]]"
msgstr "ШИРОЧИÐÐ[,ОТСТЪП_1[,ОТСТЪП_2]]"
-#: builtin/shortlog.c:236
+#: builtin/shortlog.c:248
msgid "Linewrap output"
msgstr ""
"ПренаÑÑне на редовете до тази обща ШИРОЧИÐÐ (76), Ñ ÐžÐ¢Ð¡Ð¢ÐªÐŸ_1 (6) за Ð¿ÑŠÑ€Ð²Ð¸Ñ "
@@ -10853,84 +11393,186 @@ msgid "skip and remove all lines starting with comment character"
msgstr "пропуÑкане на вÑички редове, които започват Ñ â€ž#“"
#: builtin/stripspace.c:38
-msgid "prepend comment character and blank to each line"
-msgstr "добавÑне на „# “ на вÑеки ред"
+msgid "prepend comment character and space to each line"
+msgstr "добавÑне на „# “ в началото на вÑеки ред"
+
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Такъв указател нÑма: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Очаква Ñе пълно име на указател, а не „%s“"
-#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не може да Ñе махне компонент от адреÑа „%s“"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° определÑнето на отноÑителните пътища"
-#: builtin/submodule--helper.c:84
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Във файла „.gitmodules“ не е открит Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „%s“"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "ÐеуÑпешно региÑтриране на Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „%s“"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "РегиÑтриран е подмодул „%s“ (%s) за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „%s“\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "ПРЕДУПРЕЖДЕÐИЕ: препоръчва Ñе режим на обновÑване за подмодула „%s“\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+"ÐеуÑпешно региÑтриране на режима на обновÑване за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „%s“"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Без извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸ инициализирането на подмодул"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper name [ПЪТ]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:120
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¿ÑŠÑ‚Ñ â€ž%s“"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "къде да Ñе клонира новиÑÑ‚ подмодул"
-#: builtin/submodule--helper.c:173
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "име на Ð½Ð¾Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "адреÑ, от който да Ñе клонира новиÑÑ‚ подмодул"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:188
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРÐÐИЛИЩЕ] "
-"[--name ИМЕ] [--url ÐДРЕС][--depth ДЪЛБОЧИÐÐ] [--] ПЪТ…]"
+"[--name ИМЕ] [--depth ДЪЛБОЧИÐÐ] --url ÐДРЕС --path ПЪТ…"
-#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
-#: builtin/submodule--helper.c:216
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "ДиректориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/submodule--helper.c:204
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "ÐеуÑпешно клониране на адреÑа „%s“ в Ð¿ÑŠÑ‚Ñ â€ž%s“ като подмодул"
-#: builtin/submodule--helper.c:227
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "файлът „%s“ не може да бъде отворен"
-#: builtin/submodule--helper.c:232
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "файлът „%s“ не може да Ñе затвори"
-#: builtin/submodule--helper.c:247
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директориÑта на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:273
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "ФÐТÐЛÐРГРЕШКÐ: „submodule--helper“ Ñ‚Ñ€Ñбва да Ñе Ñтартира Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "ПътÑÑ‚ на подмодула „%s“ не е инициализиран"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "ВероÑтно иÑкахте да използвате „update --init“?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "ПреÑкачане на неÑÐ»ÐµÑ‚Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ» „%s“"
-#: builtin/submodule--helper.c:280
+#: builtin/submodule--helper.c:660
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "ФÐТÐЛÐРГРЕШКÐ: „%s“ не е подкоманда на „submodule--helper“"
+msgid "Skipping submodule '%s'"
+msgstr "ПреÑкачане на подмодула „%s“"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "път към работното дърво"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "път към работното дърво, през границите на вложените подмодули"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr ""
+"„rebase“ (пребазиране), „merge“ (Ñливане), „checkout“ (изтеглÑне) или "
+"„none“ (нищо да не Ñе прави)"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Плитко клониране, ограничено до ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð±Ñ€Ð¾Ð¹ верÑии"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "брой паралелни процеÑи"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "без извеждане на напредъка на клонирането"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "неправилен параметър към опциÑта „--update“"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "„submodule--helper“ Ñ‚Ñ€Ñбва да Ñе Ñтартира Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "„%s“ не е подкоманда на „submodule--helper“"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10985,27 +11627,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v ЕТИКЕТ…"
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "името на етикета е твърде дълго: „%.*s“…"
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "етикетът „%s“ не може да бъде проверен"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -11018,7 +11655,7 @@ msgstr ""
" %s\n"
"Редовете, които започват Ñ â€ž%c“, ще бъдат пропуÑнати.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -11085,7 +11722,7 @@ msgstr "анотирането на етикети изиÑква Ñъобщен
#: builtin/tag.c:350
msgid "tag message"
-msgstr "Ñъобщение за етикет"
+msgstr "СЪОБЩЕÐИЕ за етикет"
#: builtin/tag.c:352
msgid "annotated and GPG-signed tag"
@@ -11125,7 +11762,7 @@ msgstr "извеждане Ñамо на неÑлетите етикети"
#: builtin/tag.c:370
msgid "print only tags of the object"
-msgstr "извеждане Ñамо на етикетите на обекта"
+msgstr "извеждане Ñамо на етикетите на ОБЕКТÐ"
#: builtin/tag.c:399
msgid "--column and -n are incompatible"
@@ -11145,28 +11782,28 @@ msgstr "ОпциÑта „-points-at“ изиÑква опциÑта „-l“."
#: builtin/tag.c:425
msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "Опцииите „--merged“ и „--no-merged“ изиÑкват опциÑта „-l“."
+msgstr "Опциите „--merged“ и „--no-merged“ изиÑкват опциÑта „-l“."
# FIXME message pattern
#: builtin/tag.c:433
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ Ñа неÑъвмеÑтими."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече ÑъщеÑтвува"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -11175,210 +11812,223 @@ msgstr "Обновен етикет „%s“ (бе „%s“)\n"
msgid "Unpacking objects"
msgstr "Разпакетиране на обектите"
-#: builtin/update-index.c:70
+#: builtin/update-index.c:79
#, c-format
msgid "failed to create directory %s"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/update-index.c:76
+#: builtin/update-index.c:85
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%s“"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:95
#, c-format
msgid "failed to create file %s"
msgstr "файлът „%s“ не може да бъде Ñъздаден"
-#: builtin/update-index.c:94
+#: builtin/update-index.c:103
#, c-format
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:101 builtin/update-index.c:203
+#: builtin/update-index.c:110 builtin/update-index.c:212
#, c-format
msgid "failed to delete directory %s"
msgstr "директориÑта „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:124
+#: builtin/update-index.c:133
#, c-format
-msgid "Testing "
-msgstr "Проба"
+msgid "Testing mtime in '%s' "
+msgstr "Проверка на времето на промÑна (mtime) на файла „%s“"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:145
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта не Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед "
"добавÑнето на нов файл"
-#: builtin/update-index.c:149
+#: builtin/update-index.c:158
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта не Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед "
"добавÑнето на нова директориÑ"
-#: builtin/update-index.c:162
+#: builtin/update-index.c:171
msgid "directory stat info changes after updating a file"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед "
"обновÑването на нов файл"
-#: builtin/update-index.c:173
+#: builtin/update-index.c:182
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед добавÑнето "
"на файл в поддиректориÑ"
-#: builtin/update-index.c:184
+#: builtin/update-index.c:193
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта не Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед "
"изтриването на файл"
-#: builtin/update-index.c:197
+#: builtin/update-index.c:206
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информациÑта получена чрез „stat“ за директориÑта не Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ñлед "
"изтриването на директориÑ"
-#: builtin/update-index.c:204
+#: builtin/update-index.c:213
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:575
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФÐЙЛ…]"
-#: builtin/update-index.c:918
+#: builtin/update-index.c:930
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване Ñ Ð¾Ð±Ð½Ð¾Ð²Ñването, дори когато индекÑÑŠÑ‚ Ñ‚Ñ€Ñбва да бъде обновен"
-#: builtin/update-index.c:921
+#: builtin/update-index.c:933
msgid "refresh: ignore submodules"
msgstr "подмодулите да Ñе игнорират при обновÑването"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "do not ignore new files"
msgstr "новите файлове да не Ñе игнорират"
-#: builtin/update-index.c:926
+#: builtin/update-index.c:938
msgid "let files replace directories and vice-versa"
msgstr "файлове да могат да заменÑÑ‚ директории и обратно"
-#: builtin/update-index.c:928
+#: builtin/update-index.c:940
msgid "notice files missing from worktree"
msgstr "предупреждаване при липÑващи в работното дърво файлове"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "refresh even if index contains unmerged entries"
msgstr "обновÑване дори и индекÑÑŠÑ‚ да Ñъдържа неÑлети обекти"
-#: builtin/update-index.c:933
+#: builtin/update-index.c:945
msgid "refresh stat information"
msgstr "обновÑване на информациÑта от функциÑта „stat“"
-#: builtin/update-index.c:937
+#: builtin/update-index.c:949
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опциÑта „--refresh“, но да Ñе проверÑÑ‚ и обектите, които Ñа били приети "
"за непроменени"
-#: builtin/update-index.c:941
+#: builtin/update-index.c:953
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:954
msgid "add the specified entry to the index"
msgstr "добавÑне на изброените обекти към индекÑа"
-#: builtin/update-index.c:946
+#: builtin/update-index.c:958
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на ÑтойноÑтта на флага дали файлът е изпълним"
-#: builtin/update-index.c:951
+#: builtin/update-index.c:963
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не Ñе променÑ"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:966
msgid "clear assumed-unchanged bit"
msgstr "изчиÑтване на флага, че файлът не Ñе променÑ"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете Ñа Ñамо за индекÑа"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear skip-worktree bit"
msgstr "изчиÑтване на флага, че файловете Ñа Ñамо за индекÑа"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "add to index only; do not add content to object database"
msgstr "добавÑне Ñамо към индекÑа без добавÑне към базата от данни за обектите"
-#: builtin/update-index.c:965
+#: builtin/update-index.c:977
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да ÑъщеÑтвуват в работното дърво"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:979
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--stdin“ — входните редове Ñа разделени Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ "
"байт"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на ÑпиÑъка Ñ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð° за обновÑване от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "add entries from standard input to the index"
msgstr "добавÑне на елементите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ към индекÑа"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:989
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възÑтановÑване на ÑÑŠÑтоÑнието преди Ñливане или нужда от обновÑване за "
"изброените пътища"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:993
msgid "only update entries that differ from HEAD"
msgstr "добавÑне Ñамо на Ñъдържанието, което Ñе различава от това в „HEAD“"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:997
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липÑват в работното дърво"
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1000
msgid "report actions to standard output"
msgstr "извеждане на дейÑтвиÑта на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´"
-#: builtin/update-index.c:990
+#: builtin/update-index.c:1002
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравÑне на запиÑаната Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° неразрешени конфликти — за командите "
"от потребителÑко ниво"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "write index in this format"
msgstr "запиÑване на индекÑа в този формат"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "enable or disable split index"
msgstr "включване или изключване на разделÑнето на индекÑа"
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1010
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неÑледените файлове"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
+msgid "test if the filesystem supports untracked cache"
+msgstr "проверка дали файловата ÑиÑтема поддържа кеш за неÑледени файлове"
+
+#: builtin/update-index.c:1014
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неÑледените файлове без проверка на файловата ÑиÑтема"
+#: builtin/update-index.c:1134
+msgid "Untracked cache disabled"
+msgstr "Кешът за неÑледените файлове е изключен"
+
+#: builtin/update-index.c:1146
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Кешът за неÑледените файлове е изключен за „%s“"
+
#: builtin/update-ref.c:9
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_ÐÐ_УКÐЗÐТЕЛ [СТÐРÐ_СТОЙÐОСТ]"
@@ -11426,7 +12076,7 @@ msgstr "git verify-tag [-v | --verbose] ПОДÐÐ’ÐÐЕ…"
msgid "print commit contents"
msgstr "извеждане на Ñъдържанието на подаването"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "извеждане на Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´ от ÑÑŠÑтоÑнието на „gpg“"
@@ -11446,7 +12096,7 @@ msgstr "извеждане Ñамо на ÑтатиÑтиката"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] ЕТИКЕТ…"
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "извеждане на Ñъдържанието на ЕТИКЕТи"
@@ -11462,71 +12112,75 @@ msgstr "git worktree prune [ОПЦИЯ…]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректориÑ"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не ÑъщеÑтвува"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ Ñочи неÑъщеÑтвуващо "
"меÑтоположение"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "„%s“ не може да Ñе изтрие"
+msgid "failed to remove '%s'"
+msgstr "директориÑта „%s“ не може да бъде изтрита"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече ÑъщеÑтвува"
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "директориÑта „%s“ не може да бъде Ñъздадена"
-#: builtin/worktree.c:271
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "ПодготвÑне на %s (идентификатор %s)"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "ИзтеглÑне КЛОÐа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "Ñъздаване на нов клон"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "Ñъздаване или занулÑване на клони"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "отделÑне на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ към указаното подаване"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "подготвÑне на новото работно дърво"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ Ñа неÑъвмеÑтими една Ñ Ð´Ñ€ÑƒÐ³Ð°"
@@ -11546,7 +12200,7 @@ msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° обект-дърво за поддиректориÑÑ‚Ð
msgid "only useful for debugging"
msgstr "Ñамо за изчиÑтване на грешки"
-#: credential-cache--daemon.c:255
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "извеждане на ÑъобщениÑта за траÑиране на Ñтандартната грешка"
@@ -11562,6 +12216,10 @@ msgstr ""
"за\n"
"нÑкое определено ПОÐЯТИЕ използвайте „git help ПОÐЯТИЕ“."
+#: http.c:322
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "Задаването на поÑтоÑнен публичен ключ не Ñе поддържа от cURL < 7.44.0"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "Ñъздаване на работно дърво (погледнете: „git help tutorial“)"
@@ -11645,8 +12303,8 @@ msgid "Update remote refs along with associated objects"
msgstr "ОбновÑване на отдалечените указатели и Ñвързаните Ñ Ñ‚ÑÑ… обекти"
#: common-cmds.h:32
-msgid "Forward-port local commits to the updated upstream head"
-msgstr "Пребазиране на промени към нова оÑнова"
+msgid "Reapply commits on top of another base tip"
+msgstr "Прилагане на подаваниÑта върху друг връх"
#: common-cmds.h:33
msgid "Reset current HEAD to the specified state"
@@ -11690,7 +12348,7 @@ msgstr "по-малко подробноÑти"
msgid "use <n> digits to display SHA-1s"
msgstr "да Ñе показват такъв БРОЙ цифри от Ñумите по SHA1"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"при възможноÑÑ‚ преизползване на решението на конфликта за обновÑване на "
@@ -11853,7 +12511,6 @@ msgstr ""
msgid "bisect run cannot continue any more"
msgstr "двоичното Ñ‚ÑŠÑ€Ñене не може да продължи"
-# FIXME initial space
#: git-bisect.sh:531
#, sh-format
msgid ""
@@ -11919,16 +12576,16 @@ msgstr ""
"За да откажете пребазирането и да Ñе върнете към първоначалното ÑÑŠÑтоÑние,\n"
"изпълнете „git rebase --abort“."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "Ðвтоматично Ñкатаното е приложено."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "„${stash_sha1}“ не може да бъде запазен"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11938,34 +12595,30 @@ msgstr ""
"надеждно Ñкатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
"или да ги изхвърлите чрез „git stash drop“, когато поиÑкате.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
"Изглежда, че Ñега Ñе прилагат кръпки чрез командата „git-am“. Ðе може да "
"пребазирате в момента."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "ОпциÑта „--exec“ задължително изиÑква опциÑта „--interactive“"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"ОпциÑта „--edit-todo“ е доÑтъпна Ñамо по време на интерактивно пребазиране."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "УказателÑÑ‚ „HEAD“ не може да бъде прочетен"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11973,12 +12626,12 @@ msgstr ""
"ТрÑбва да редактирате вÑички конфликти при Ñливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Връщането към „${head_name}“ е невъзможно"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11998,69 +12651,69 @@ msgstr ""
"и отново започнете пребазирането. Текущото пребазиране Ñе преуÑтановÑва, за\n"
"да не загубите Ñлучайно промени."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "неправилна оÑнова за Ñравнение „${upstream_name}“"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
"указателÑÑ‚ „${onto_name}“ може да Ñочи към повече от една оÑнова за "
"пребазирането"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "указателÑÑ‚ „${onto_name}“ не Ñочи към никаква оÑнова за пребазирането"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "УказателÑÑ‚ „${onto_name}“ не Ñочи към подаване"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ФÐТÐЛÐРГРЕШКÐ: не ÑъщеÑтвува клон „${branch_name}“"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Ðе може да Ñе Ñкатае автоматично"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Ðвтоматично Ñкатано: „${stash_abbrev}“"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Промените Ñ‚Ñ€Ñбва или да Ñе подадат, или да Ñе ÑкатаÑÑ‚."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "ТекущиÑÑ‚ клон „${branch_name}“ е напълно актуален."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"ТекущиÑÑ‚ клон „${branch_name}“ е напълно актуален. Пребазирането е "
"принудително."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Промените от „${mb}“ към „${onto}“:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Първо, указателÑÑ‚ „HEAD“ започва да Ñочи към базата, върху коÑто пребазирате…"
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Тривиално Ñливане на „${branch_name}“ върху „${onto_name}“."
@@ -12207,31 +12860,26 @@ msgstr "Ðе е указано име на клон"
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възÑтановите, изпълнете командата „git stash apply“)"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "не може да Ñе махне компонент от адреÑа „${remoteurl}“"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"ОтноÑителен път може да Ñе ползва Ñамо от оÑновната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° работното "
"дърво"
# FIXME - what is this regex?
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"Ð°Ð´Ñ€ÐµÑ Ð½Ð° хранилище: „${repo}“ Ñ‚Ñ€Ñбва или да е абÑолютен, или да започва Ñ "
"„./“ или „../“"
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "„${sm_path}“ вече ÑъщеÑтвува в индекÑа"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12242,24 +12890,24 @@ msgstr ""
"${sm_path}\n"
"Използвайте опциÑта „-f“, ако за да го добавите наиÑтина."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "ДобавÑне на ÑъщеÑтвуващото хранилище в „${sm_path}“ към индекÑа"
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "„${sm_path}“ ÑъщеÑтвува, а не е хранилище на Git"
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Открита е локална Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git — „${sm_name}“, коÑто Ñочи към "
"отдалечените хранилища:"
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -12267,7 +12915,7 @@ msgstr ""
"Ðко иÑкате да преизползвате тази локална Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Git вмеÑто да отново "
"да клонирате:"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -12275,7 +12923,7 @@ msgstr ""
"използвайте опциÑта „--force“. Ðко локалната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ Ñочи към "
"правилното отдалечено хранилище"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -12285,77 +12933,55 @@ msgstr ""
"аргумент на опциÑта „--name“."
# FIXME активиране - какво вÑъщноÑÑ‚ Ñтава
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Ðктивиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "ÐеуÑпешно добавÑне на подмодула „${sm_path}“"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "ÐеуÑпешно региÑтриране на подмодула „${sm_path}“"
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Влизане в „${prefix}${displaypath}“"
+msgid "Entering '$displaypath'"
+msgstr "Влизане в „${displaypath}“"
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-"Спиране при „${prefix}${displaypath}“ — изходниÑÑ‚ код от Ñкрипта бе различен "
-"от 0."
+"Спиране при „${displaypath}“ — изходниÑÑ‚ код от Ñкрипта бе различен от 0."
-#: git-submodule.sh:483
+#: git-submodule.sh:448
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Във файла „.gitmodules“ не е открит Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "ÐеуÑпешно региÑтриране на Ð°Ð´Ñ€ÐµÑ Ð·Ð° Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
+msgid "pathspec and --all are incompatible"
+msgstr "указването на път е неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--all“"
-#: git-submodule.sh:494
+#: git-submodule.sh:453
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"РегиÑтриран е подмодул „${name}“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž${url}“, за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ "
-"подмодул „${displaypath}“"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Използвайте „--all“, за да премахнете вÑички подмодули"
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"ÐеуÑпешно региÑтриране на режима на обновÑване за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Използвайте „.“, за да премахнете вÑички подмодули"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"ПътÑÑ‚ към подмодул „${displaypath}“ в работното дърво Ñъдържа Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ â€ž."
"git“"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12363,7 +12989,7 @@ msgstr ""
"(използвайте командата „rm -rf“, за да го изтриете заедно Ñ Ñ†Ñлата му "
"иÑториÑ)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12372,147 +12998,142 @@ msgstr ""
"ПътÑÑ‚ към подмодул „${displaypath}“ в работното дърво Ñъдържа локални "
"промени. Можете да ги пренебрегнете и отмените Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-f“"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "ДиректориÑта „${displaypath}“ е изчиÑтена"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"ДиректориÑта към работното дърво на подмодула „${displaypath}“ не може да "
"бъде изтрита"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Празната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° подмодула „${displaypath}“ не може да бъде Ñъздадена"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Премахната е региÑтрациÑта на подмодул „${name}“, Ñочещ към Ð°Ð´Ñ€ÐµÑ â€ž${url}“, "
"за Ð¿ÑŠÑ‚Ñ â€ž${displaypath}“"
-#: git-submodule.sh:705
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"ПътÑÑ‚ към подмодул „${displaypath}“ не е инициализиран.\n"
-"Пробвайте Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð° „update --init“."
-
-#: git-submodule.sh:718
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата верÑÐ¸Ñ Ð·Ð° подмодула в „${displaypath}“ липÑва"
-#: git-submodule.sh:727
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${sm_path}“"
-#: git-submodule.sh:751
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "ÐеуÑпешно доÑтавÑне в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:765
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешно изтеглÑне на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“'"
-#: git-submodule.sh:766
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е верÑÐ¸Ñ â€ž${sha1}“"
-#: git-submodule.sh:770
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешно пребазиране на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
"„${displaypath}“"
-#: git-submodule.sh:771
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху верÑÐ¸Ñ â€ž${sha1}“"
-#: git-submodule.sh:776
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешно Ñливане на верÑÐ¸Ñ â€ž${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:777
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: Ñливане Ñ Ð²ÐµÑ€ÑÐ¸Ñ â€ž${sha1}“"
-#: git-submodule.sh:782
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешно изпълнение на командата „${command} ${sha1}“ в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул "
-"„${prefix}${sm_path}“"
+"„${displaypath}“"
-#: git-submodule.sh:783
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Път към подмодул „${prefix}${sm_path}“: „${command} ${sha1}“"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:813
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
-#: git-submodule.sh:921
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ Ñа неÑъвмеÑтими"
-#: git-submodule.sh:973
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:993
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа подаването „${sha1_src}“"
-#: git-submodule.sh:996
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:999
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕÐИЕ: „${display_name}“ не Ñъдържа никое от подаваниÑта "
"„${sha1_src}“ и „${sha1_dst}“"
-#: git-submodule.sh:1024
+#: git-submodule.sh:940
msgid "blob"
msgstr "обект BLOB"
-#: git-submodule.sh:1142
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
"ÐеуÑпешна обработка на поддиректориите в Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${sm_path}“"
-#: git-submodule.sh:1206
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизиране на адреÑа за Ð¿ÑŠÑ‚Ñ ÐºÑŠÐ¼ подмодул „${displaypath}“"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ ръководÑтвото на „git-${cmd}(1)“"
diff --git a/po/de.po b/po/de.po
index 0eadf34..d50cb1b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
"PO-Revision-Date: 2015-01-21 15:01+0800\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
@@ -31,7 +31,7 @@ msgstr ""
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
@@ -75,7 +75,7 @@ msgstr "Format"
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "Präfix"
@@ -83,11 +83,11 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
-#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
+#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
+#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "Datei"
@@ -119,7 +119,8 @@ msgstr "besser komprimieren"
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "Repository"
@@ -277,11 +278,16 @@ msgstr "mehrdeutiger Objekt-Name: '%s'"
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -292,7 +298,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -301,10 +307,10 @@ msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -343,21 +349,21 @@ msgstr "\"rev-list\" abgebrochen"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
@@ -366,8 +372,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen"
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -401,22 +407,22 @@ msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
@@ -438,24 +444,27 @@ msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2226
+#: config.c:2224
#, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "Konnte '%s' nicht aufheben."
+
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "Fehler beim Schreiben nach rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
#: date.c:95
msgid "in the future"
@@ -530,27 +539,27 @@ msgstr[1] "vor %lu Jahren"
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -559,16 +568,16 @@ msgstr ""
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -577,22 +586,22 @@ msgstr ""
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2123
+#: dir.c:1942
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."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "konnte gpg nicht ausführen"
@@ -606,28 +615,28 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "konnte temporäre Datei '%s' nicht erstellen: %s"
+msgid "could not create temporary file '%s'"
+msgstr "konnte temporäre Datei '%s' nicht erstellen"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "Fehler beim Schreiben der Signatur nach '%s': %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "Konnte '%s' nicht lesen"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': read() zu kurz %s"
+msgid "'%s': short read"
+msgstr "'%s': read() zu kurz"
#: help.c:205
#, c-format
@@ -693,12 +702,37 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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 ""
+"Konnte '%s.lock' nicht erstellen: %s.\n"
+"\n"
+"Ein anderer Git-Prozess scheint in diesem Repository ausgeführt\n"
+"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n"
+"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n"
+"versuchen Sie es erneut. Falls es immer noch fehlschlägt, könnte\n"
+"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
+"Löschen Sie die Datei manuell um fortzufahren."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Konnte '%s.lock' nicht erstellen: %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
@@ -745,7 +779,7 @@ msgstr "kann Objekt %s '%s' nicht lesen"
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
@@ -882,7 +916,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "Submodul"
@@ -911,50 +945,50 @@ msgstr ""
"KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
"hinzu."
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Fataler Merge-Fehler. Sollte nicht passieren."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "unverarbeiteter Pfad??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, 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:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
@@ -986,28 +1020,28 @@ msgstr "Ungültiger %s Wert: '%s'"
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-NUM"
@@ -1016,7 +1050,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
@@ -1088,7 +1122,7 @@ msgstr ""
":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n"
"Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufügen?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
@@ -1114,23 +1148,23 @@ msgstr ""
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Konnte Referenz %s nicht entfernen: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "Konnte Referenzen nicht entfernen: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
@@ -1269,96 +1303,96 @@ msgstr "Format: %%(end) Atom fehlt"
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
-#: remote.c:745
+#: remote.c:746
#, 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:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Interner Fehler"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1695
+#: remote.c:1696
#, 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:1710
+#: remote.c:1711
#, 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:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:2073
+#: remote.c:2074
#, 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:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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 vor '%s' um %d Commit.\n"
msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n"
-#: remote.c:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1368,12 +1402,12 @@ msgstr[0] ""
msgstr[1] ""
"Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n"
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1388,22 +1422,22 @@ msgstr[1] ""
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2114
+#: remote.c:2115
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"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
@@ -1455,7 +1489,7 @@ msgstr ""
"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Konnte nicht nach %s schreiben"
@@ -1467,12 +1501,11 @@ msgstr "Fehler bei Nachbereitung von %s"
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
-msgstr ""
-"Ihre lokalen Änderungen würden von \"cherry-pick\" überschrieben werden."
+msgstr "Ihre lokalen Änderungen würden durch den Cherry-Pick überschrieben werden."
#: sequencer.c:210
msgid "Your local changes would be overwritten by revert."
-msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden."
+msgstr "Ihre lokalen Änderungen würden durch den Revert überschrieben werden."
#: sequencer.c:213
msgid "Commit your changes or stash them to proceed."
@@ -1615,12 +1648,12 @@ msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
msgid "Could not create sequencer directory %s"
msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Fehler beim Einpacken von %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
@@ -1632,63 +1665,72 @@ msgstr "kann HEAD nicht auflösen"
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "Kann %s nicht öffnen: %s"
+msgid "cannot open %s"
+msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "Kann %s nicht lesen: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:888
+#: sequencer.c:887
#, 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:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Konnte %s nicht formatieren."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
@@ -1718,31 +1760,40 @@ msgstr ""
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
"Sie zuerst die Konflikte auf"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Ungültiger Wert für %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1802,7 +1853,240 @@ msgstr "konnte temporäre Datei nicht zu %s umbenennen"
msgid "Could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden beim Auschecken\n"
+"überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen."
+
+#: unpack-trees.c:71
+#, 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"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch %s\n"
+"überschrieben werden:\n"
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Durch die Aktualisierung der folgenden Verzeichnisse würden unversionierte\n"
+"Dateien in diesen Verzeichnissen verloren gehen:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch\n"
+"den Checkout entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s entfernt werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s entfernt werden:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Checkout überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"Merge überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s überschrieben werden:\n"
+"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Die folgenden unversionierten Dateien im Arbeitsverzeichnis würden durch den\n"
+"%s überschrieben werden:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind nicht\n"
+"aktuell:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
+"des partiellen Checkouts überschrieben werden:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Die folgenden Dateien im Arbeitsbereich würden durch die Aktualisierung\n"
+"des partiellen Checkouts entfernt werden:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Abbruch\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "Checke Dateien aus"
@@ -1840,210 +2124,206 @@ msgstr "ungültiges '..' Pfadsegment"
msgid "could not open '%s' for reading and writing"
msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "konnte nicht auf '%s' zugreifen: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "Konnte nicht nach '%s' schreiben."
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "Konnte '%s' nicht schließen."
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
"markieren)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
"in den Submodulen)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "Bug: unbehandelter Unmerged-Status %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "neue Datei:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "kopiert:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "gelöscht:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "geändert:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "umbenannt:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "Typänderung:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "unbekannt:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "nicht gemerged:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "neue Commits, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "Fehler: unbehandelter Differenz-Status %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2051,40 +2331,40 @@ msgstr ""
"Ändern Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird entfernt."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
@@ -2249,43 +2529,43 @@ msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2296,32 +2576,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:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2330,56 +2610,56 @@ msgstr ""
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen "
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, 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:1525
+#: wt-status.c:1547
#, 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 Sie \"git "
"add\" zum Versionieren)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, 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:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Initialer Commit auf "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "entfernt"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "voraus "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -2393,7 +2673,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
@@ -2407,7 +2687,7 @@ msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
@@ -2445,14 +2725,14 @@ msgstr ""
"ignoriert:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "erweiterte Ausgaben"
@@ -2460,7 +2740,7 @@ msgstr "erweiterte Ausgaben"
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
@@ -2532,16 +2812,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Meinten Sie vielleicht 'git add .'?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
@@ -2569,16 +2849,6 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2588,82 +2858,82 @@ msgstr "konnte Patch '%s' nicht parsen"
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:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, 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:1189
+#: builtin/am.c:1188
#, 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:1190
+#: builtin/am.c:1189
#, 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:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Patch ist leer. War dessen Aufteilung falsch?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1631
+#: builtin/am.c:1630
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:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2671,39 +2941,39 @@ msgstr ""
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
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:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1769
+#: builtin/am.c:1768
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."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -2711,35 +2981,35 @@ msgstr "Commit-Beschreibung ist:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
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:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2750,7 +3020,7 @@ msgstr ""
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2758,17 +3028,17 @@ msgstr ""
"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
"Haben Sie vergessen 'git add' zu benutzen?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2776,153 +3046,155 @@ msgstr ""
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
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:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
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:2267
+#: builtin/am.c:2266
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:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "Aktion"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "Wurzelverzeichnis"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "Pfad"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
+#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
+#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "Anzahl"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "Format"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2930,16 +3202,16 @@ msgstr ""
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, 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:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2948,7 +3220,7 @@ msgstr ""
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
@@ -2981,41 +3253,41 @@ msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
"%d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3030,65 +3302,65 @@ msgstr[1] ""
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -3096,12 +3368,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)"
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, 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"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3110,337 +3382,347 @@ msgstr ""
"bei der Suche nach:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, 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)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "Konnte %s nicht lesen"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, 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)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, 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"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "interner Fehler"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "Kann %s nicht öffnen: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ausgelassen."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
"ausgegeben"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
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"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "kann Patch '%s' nicht öffnen"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, 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"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3506,102 +3788,102 @@ msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
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:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
@@ -3611,31 +3893,31 @@ msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren, und 11 Monaten"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3644,7 +3926,7 @@ msgstr ""
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3653,12 +3935,12 @@ msgstr ""
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3668,303 +3950,323 @@ msgstr ""
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr ""
-"Kann Branch '%s' nicht entfernen, da Sie sich gerade auf diesem befinden."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: entfernt]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d hinterher]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[%d hinterher]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d voraus]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[%d voraus]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d voraus, %d hinterher]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d voraus, %d hinterher]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** ungültige Referenz ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(kein Branch)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Branch %s wird auf %s umgesetzt"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Binäre Suche von Branch %s zu %s im Gange"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "Konnte Beschreibungsvorlage für Branch nicht schreiben."
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "Upstream"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "Informationen zum Upstream-Branch ändern"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, welche diesen Commit beinhalten"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "Schüssel"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3972,43 +4274,43 @@ msgstr ""
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr ""
"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
"auf keinen Branch zeigt."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD' darf nicht manuell erstellt werden"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
"Branchnamen verwendet werden."
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4017,7 +4319,7 @@ msgstr ""
"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
"track oder --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -4028,16 +4330,6 @@ msgstr ""
"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
"Sie aus:\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4140,7 +4432,7 @@ 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:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -4233,8 +4525,9 @@ msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "Zeichenkette"
@@ -4285,80 +4578,80 @@ msgstr "Pfad '%s': kann nicht zusammenführen"
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, 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:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "beschädigte Index-Datei"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
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:623
+#: builtin/checkout.c:622
#, 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:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4381,7 +4674,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4408,152 +4701,152 @@ msgstr[1] ""
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch geboren wird"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "HEAD zu benanntem Commit setzen"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
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:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4563,12 +4856,12 @@ msgstr ""
"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
"werden kann?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, 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:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4720,8 +5013,8 @@ msgstr "interaktives Clean"
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "Muster"
@@ -4761,105 +5054,113 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "Anzahl der parallel zu klonenden Submodule"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "Name"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4867,62 +5168,57 @@ msgstr ""
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, 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."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4932,132 +5228,132 @@ msgstr ""
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Prüfe Konnektivität ... "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
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:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, 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:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
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:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
"local"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Weiß nicht wie %s zu klonen ist."
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -5200,67 +5496,67 @@ msgstr ""
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
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:447
+#: builtin/commit.c:449
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:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5268,38 +5564,38 @@ msgstr ""
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "Konnte MERGE_MSG nicht lesen"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "Konnte MERGE_MSG nicht lesen"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5314,7 +5610,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5329,7 +5625,7 @@ msgstr ""
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5339,7 +5635,7 @@ msgstr ""
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5352,157 +5648,157 @@ msgstr ""
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, 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:1055
+#: builtin/commit.c:1066
#, 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:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
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:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
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:1151
+#: builtin/commit.c:1162
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:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
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:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
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:1191
+#: builtin/commit.c:1202
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:1193
+#: builtin/commit.c:1204
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:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Klug ... den letzten Commit mit einem geänderten Index nachbessern."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
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:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "ignorierte Dateien anzeigen"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5510,203 +5806,203 @@ msgstr ""
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "Konnte neulich erstellten Commit nicht analysieren."
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
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:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "\"pre-commit hook\" umgehen"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, 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:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5855,7 +6151,7 @@ msgstr ""
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5870,7 +6166,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
@@ -5906,7 +6202,7 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
msgid "tag '%s' is really '%s' here"
msgstr "Tag '%s' ist eigentlich '%s' hier"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
@@ -5999,7 +6295,7 @@ msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
@@ -6035,21 +6331,21 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -6122,19 +6418,19 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
@@ -6142,7 +6438,7 @@ msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
@@ -6154,21 +6450,21 @@ msgstr "nicht alle Tags anfordern (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
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:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
@@ -6176,16 +6472,16 @@ msgstr "heruntergeladenes Paket behalten"
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "Verzeichnis"
@@ -6197,15 +6493,15 @@ msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
msgid "default mode for recursion"
msgstr "Standard-Modus für Rekursion"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
@@ -6264,11 +6560,6 @@ msgstr "Aktualisierung erzwungen"
msgid "(non-fast-forward)"
msgstr "(kein Vorspulen)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "kann %s nicht öffnen: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6479,55 +6770,55 @@ msgstr "Prüfe Konnektivität"
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Prüfe Objekte"
@@ -6637,226 +6928,226 @@ msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "Ãœbereinstimmungen hervorheben"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
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:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
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:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
"werden."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
"Die Optionen --no-index und --untracked können nicht mit Commits verwendet "
"werden."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
"verwendet werden."
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
@@ -6947,8 +7238,8 @@ msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "Fehler beim Ausführen von '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "Fehler beim Ausführen von '%s'"
#: builtin/help.c:205
#, c-format
@@ -7207,107 +7498,109 @@ msgstr "Fehler beim Auflösen der Unterschiede"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "abgeschlossen mit %d lokalen Objekten"
+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:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelöste Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, 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:1587
+#: builtin/index-pack.c:1589
#, 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:1594
+#: builtin/index-pack.c:1596
#, 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:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
@@ -7346,27 +7639,27 @@ msgstr "kann '%s' nicht nach '%s' kopieren"
msgid "ignoring template %s"
msgstr "ignoriere Vorlage %s"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "keine Vorlagen in '%s' gefunden"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "kopiere keine Vorlagen von '%s': %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s existiert bereits"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "kann nicht mit Dateityp %d umgehen"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "Konnte %s nicht nach %s verschieben"
@@ -7374,24 +7667,24 @@ msgstr "Konnte %s nicht nach %s verschieben"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-Repository in %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "Reinitialisierte existierendes"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "Initialisierte leeres"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " gemeinsames"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7399,25 +7692,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7426,7 +7719,7 @@ msgstr ""
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
@@ -7472,266 +7765,318 @@ msgstr "git show [<Optionen>] <Objekt>..."
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:137
+#: builtin/log.c:143
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:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Unbekannter Commit %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Konnte keine exakte Merge-Basis finden."
+
+#: builtin/log.c:1235
+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 ""
+"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n"
+"automatisch speichern lassen möchten, benutzen Sie bitte\n"
+"'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:1255
+msgid "Failed to find exact merge base"
+msgstr "Fehler beim Finden einer exakten Merge-Basis."
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "kann Patch-Id nicht lesen"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
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:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "Header"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
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:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "Basis-Commit"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7739,11 +8084,6 @@ msgstr ""
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Unbekannter Commit %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
@@ -7943,175 +8283,179 @@ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
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:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
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:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
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:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
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:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "Schreibe SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Schließe SQUASH_MSG ab"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
"abzuschließen.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8127,55 +8471,55 @@ msgstr ""
"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, 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:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' ist kein Commit"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
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:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8183,7 +8527,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:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8191,105 +8535,109 @@ 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:1233
+#: builtin/merge.c:1245
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:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
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:1269
+#: builtin/merge.c:1281
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:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
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:1332
+#: builtin/merge.c:1344
#, 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."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, 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."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, 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"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, 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:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8400,7 +8748,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
msgid "Directory %s is in index and no submodule?"
msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
@@ -8481,48 +8829,48 @@ msgstr "%s, Quelle=%s, Ziel=%s"
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden die <Muster> entsprechen"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
@@ -8671,24 +9019,16 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
msgid "The note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8701,7 +9041,7 @@ msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "zu viele Parameter"
@@ -8748,7 +9088,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
@@ -8790,15 +9130,15 @@ msgstr ""
"Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
"Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8806,51 +9146,51 @@ msgstr ""
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
"committet werden"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -8874,176 +9214,182 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+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:776
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-"Deaktiviere Schreiben des Bitmap-Index, da einige Objekte nicht in\n"
-"eine Pack-Datei geschrieben wurden"
+"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-Datei\n"
+"geschrieben wurden."
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr ""
"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
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:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
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:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
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:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
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:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
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:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "Zeit"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
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:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "Zähle Objekte"
@@ -9071,15 +9417,15 @@ msgstr "Lösche doppelte Objekte"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "gelöschte Objekte melden"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "Objekte älter als <Zeit> verfallen lassen"
@@ -9091,52 +9437,56 @@ msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
"nicht zum Commit vorgemerkt sind."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
"nicht committete Änderungen."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9144,14 +9494,14 @@ msgstr ""
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
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:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9159,7 +9509,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:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9171,42 +9521,46 @@ msgstr ""
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 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:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 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:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<Remote-Repository>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<Branch>"
+
+#: builtin/pull.c:489 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:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können "
-"Sie\n"
-"dies tun mit:\n"
-"\n"
-" git branch --set-upstream-to=%s/<Branch> %s\n"
+"Wenn Sie Tracking-Informationen für diesen Branch setzen möchten, können Sie\n"
+"dies tun mit:"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9216,13 +9570,17 @@ msgstr ""
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash ist nur mit --rebase zulässig."
+
+#: builtin/pull.c:872
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:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9232,7 +9590,7 @@ msgstr ""
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9249,11 +9607,11 @@ msgstr ""
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
@@ -9623,12 +9981,24 @@ msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
#: builtin/read-tree.c:137
msgid "skip applying sparse checkout filter"
-msgstr "Anwendung des Filters für spärliches Auschecken überspringen"
+msgstr "Anwendung des Filters für partielles Auschecken überspringen"
#: builtin/read-tree.c:139
msgid "debug unpack-trees"
msgstr "Entpacken der Bäume protokollieren"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <Git-Verzeichnis>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "weniger Ausgaben"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Sie müssen ein Repository angeben."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9960,21 +10330,23 @@ msgstr "* Remote-Repository %s"
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(keine URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9982,159 +10354,159 @@ msgstr ""
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
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:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
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:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
@@ -10652,13 +11024,6 @@ msgstr "rekursive Entfernung erlauben"
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
-"benutzen\n"
-"Sie \"stash\", um fortzufahren."
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10869,81 +11234,182 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Referenz nicht gefunden: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Vollständiger Referenzname erwartet, %s erhalten"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, 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:366
+#, 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:370
+#, 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:380
+#, 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:387
+#, 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:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<Pfad>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, 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:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
-"<Repository>] [--name <Name>] [--url <URL>][--depth <Tiefe>] [--] [<Pfad>...]"
+"<repository>] [--name <name>] [--depth <depth>] --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>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "Kann Datei '%s' nicht öffnen"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "Konnte Datei '%s' nicht schließen."
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "fatal: submodule--helper muss mit einem Unterbefehl aufgerufen werden"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Submodul-Pfad '%s' nicht initialisiert"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Meinten Sie vielleicht 'update --init'?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Überspringe nicht zusammengeführtes Submodul %s"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Ãœberspringe Submodul '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "Pfad zum Arbeitsverzeichnis"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout oder none"
+
+#: builtin/submodule--helper.c:779
+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:782
+msgid "parallel jobs"
+msgstr "Parallele Ausführungen"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "keine Fortschrittsanzeige beim Klonen"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
+
+#: builtin/submodule--helper.c:862
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal: '%s' ist kein gültiger Unterbefehl von submodule--helper"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10998,27 +11464,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <Tagname>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "Tagname zu lang: %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "Konnte Tag '%s' nicht verifizieren"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -11031,7 +11492,7 @@ msgstr ""
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -11163,21 +11624,21 @@ msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt."
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -11445,7 +11906,7 @@ msgstr "git verify-commit [-v | --verbose] <Commit>..."
msgid "print commit contents"
msgstr "Commit-Inhalte ausgeben"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
@@ -11465,7 +11926,7 @@ msgstr "nur Statistiken anzeigen"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <Tag>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
@@ -11481,70 +11942,74 @@ msgstr "git worktree prune [<Optionen>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, 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:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, 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:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "Fehler beim Löschen: %s"
+msgid "failed to remove '%s'"
+msgstr "Fehler beim Löschen von '%s'"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Bereite %s vor (Identifikation %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
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:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "das neue Arbeitsverzeichnis auschecken"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
@@ -11564,7 +12029,7 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
@@ -11579,7 +12044,7 @@ msgstr ""
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
@@ -11719,7 +12184,7 @@ msgstr "weniger Ausgaben"
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
@@ -11941,16 +12406,16 @@ msgstr ""
"Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "\"autostash\" angewendet."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kann $stash_sha1 nicht speichern."
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11960,33 +12425,29 @@ msgstr ""
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Die Option --exec muss mit --interactive verwendet werden."
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
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."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11994,12 +12455,12 @@ msgstr ""
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Konnte nicht zu $head_name zurückgehen"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12020,67 +12481,67 @@ msgstr ""
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ungültiger Upstream-Branch $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: Branch $branch_name nicht gefunden"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Kann \"autostash\" nicht ausführen."
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "\"autostash\" erzeugt: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden ..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
@@ -12225,28 +12686,23 @@ msgstr "Kein Branchname spezifiziert"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
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:291
+#: git-submodule.sh:229
#, 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:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12257,24 +12713,24 @@ msgstr ""
"$sm_path\n"
"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, 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:332
+#: git-submodule.sh:270
#, 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:340
+#: git-submodule.sh:278
#, 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:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -12282,7 +12738,7 @@ msgstr ""
"Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt "
"erneut zu klonen"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -12290,7 +12746,7 @@ msgstr ""
"benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das "
"korrekte Repository ist"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -12299,77 +12755,56 @@ msgstr ""
"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen "
"Namen mit der Option '--name'."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Betrete '$prefix$displaypath'"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurück."
-
-#: git-submodule.sh:483
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "Keine URL für Submodul-Pfad '$displaypath' in .gitmodules gefunden"
-
-#: git-submodule.sh:492
+#: git-submodule.sh:355
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr ""
-"Fehler beim Eintragen der URL für Submodul-Pfad '$displaypath' in die "
-"Konfiguration."
+msgid "Entering '$displaypath'"
+msgstr "Betrete '$displaypath'"
-#: git-submodule.sh:494
+#: git-submodule.sh:375
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"Submodul '$name' ($url) für Pfad '$displaypath' in die Konfiguration "
-"eingetragen."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
-#: git-submodule.sh:511
+#: git-submodule.sh:448
#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad "
-"'$displaypath' in der Konfiguration."
+msgid "pathspec and --all are incompatible"
+msgstr "Pfadspezifikationen und --all sind inkompatibel."
-#: git-submodule.sh:549
+#: git-submodule.sh:453
#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-"Verwenden Sie '.' wenn Sie wirklich alle Submodule\n"
-"deinitialisieren möchten."
+"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
+"möchten."
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"Arbeitsverzeichnis des Submoduls in '$displaypath' enthält ein .git-"
"Verzeichnis"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12377,7 +12812,7 @@ msgstr ""
"(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
"seiner Historie löschen möchten)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12386,142 +12821,178 @@ msgstr ""
"Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
"verwenden Sie '-f', um diese zu verwerfen"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Verzeichnis '$displaypath' bereinigt."
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
"Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
"entfernt."
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
-"Vielleicht möchten Sie 'update --init' benutzen?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, 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:745
+#: git-submodule.sh:644
#, 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:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, 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:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"Ausführung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' "
-"fehlgeschlagen"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
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:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "Blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Siehe git-${cmd}(1) für weitere Details."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s': %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "konnte nicht auf '%s' zugreifen: %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "Konnte '%s' nicht zum Lesen öffnen: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
+
+#~ msgid " git branch -d %s\n"
+#~ msgstr " git branch -d %s\n"
+
+#~ msgid " git branch --set-upstream-to %s\n"
+#~ msgstr " git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "kann %s nicht öffnen: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
+#~ "benutzen\n"
+#~ "Sie \"stash\", um fortzufahren."
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "Konnte Tag '%s' nicht verifizieren"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "Fehler beim Löschen: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Die Option --exec muss mit --interactive verwendet werden."
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n"
+#~ "Vielleicht möchten Sie 'update --init' benutzen?"
+
#~ msgid "Forward-port local commits to the updated upstream head"
#~ msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen"
@@ -12592,9 +13063,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
#~ msgid "Could not append '%s'"
#~ msgstr "Konnte '%s' nicht anhängen."
-#~ msgid "Could not set '%s'"
-#~ msgstr "Konnte '%s' nicht setzen"
-
#~ msgid "Missing author: %s"
#~ msgstr "fehlender Autor: %s"
@@ -12732,13 +13200,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
#~ msgstr ""
#~ "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#~ msgid ""
-#~ "You have not concluded your merge (MERGE_HEAD exists).\n"
-#~ "Please, commit your changes before you can merge."
-#~ msgstr ""
-#~ "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
-#~ "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen können."
-
#~ msgid "no branch specified"
#~ msgstr "Kein Branch spezifiziert"
@@ -12951,13 +13412,6 @@ msgstr "Synchronisiere Submodul-URL für '$displaypath'"
#~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen"
#~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Die folgenden unbeobachteten Dateien würden NICHT gespeichert werden,\n"
-#~ "müssen aber durch \"stash save\" entfernt werden:"
-
-#~ msgid ""
#~ "Aborting. Consider using either the --force or --include-untracked option."
#~ msgstr ""
#~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-"
diff --git a/po/fr.po b/po/fr.po
index 88b0b8a..b18d57f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-14 20:26+0100\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -96,7 +96,7 @@ msgstr ""
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
@@ -140,7 +140,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "préfixe"
@@ -148,9 +148,9 @@ msgstr "préfixe"
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -184,7 +184,8 @@ msgstr "compression efficace"
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "dépôt"
@@ -343,11 +344,16 @@ msgstr "Nom d'objet ambigu : '%s'."
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -358,7 +364,7 @@ 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:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -367,10 +373,10 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -409,21 +415,21 @@ msgstr "rev-list a disparu"
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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
@@ -432,8 +438,8 @@ msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -468,21 +474,21 @@ msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
@@ -503,24 +509,27 @@ msgstr ""
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "impossible de régler '%s' à '%s'"
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Impossible de régler '%s' à '%s'"
+msgid "could not unset '%s'"
+msgstr "impossible de désinitialiser '%s'"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "impossible d'écrire dans la rev-list : %s"
+msgid "failed write to rev-list"
+msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "impossible de fermer l'entrée standard du rev-list : %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "impossible de fermer l'entrée standard du rev-list"
#: date.c:95
msgid "in the future"
@@ -595,28 +604,28 @@ msgstr[1] "il y a %lu ans"
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -625,16 +634,16 @@ msgstr ""
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -643,20 +652,20 @@ msgstr ""
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2123
+#: dir.c:1942
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."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "impossible de lancer gpg."
@@ -670,28 +679,28 @@ msgstr "gpg n'a pas pu signer les données"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "impossible de créer un fichier temporaire '%s' : %s"
+msgid "could not create temporary file '%s'"
+msgstr "impossible de créer un fichier temporaire '%s'"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "impossible d'écrire la signature détachée dans '%s' : %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "impossible d'écrire la signature détachée dans '%s'"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s' : %s"
+msgid "failed to stat '%s'"
+msgstr "échec du stat de '%s'"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s' : lecture tronquée %s"
+msgid "'%s': short read"
+msgstr "'%s' : lecture tronquée"
#: help.c:205
#, c-format
@@ -758,12 +767,36 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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 ""
+"Impossible de créer '%s.lock' : %s.\n"
+"\n"
+"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"
+"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"
+"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n"
+"un processus git peut avoir planté :\n"
+"supprimez le fichier manuellement pour poursuivre."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Impossible de créer '%s.lock' : %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -810,7 +843,7 @@ msgstr "impossible de lire l'objet %s '%s'"
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
@@ -946,7 +979,7 @@ msgstr "%s sauté (fusion identique à l'existant)"
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "sous-module"
@@ -974,50 +1007,50 @@ 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:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Chemin non traité ??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, 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:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -1047,28 +1080,28 @@ msgstr "Mauvaise valeur de %s : '%s'"
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-NUM"
@@ -1077,7 +1110,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -1150,7 +1183,7 @@ msgstr ""
"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
@@ -1176,23 +1209,23 @@ msgstr ""
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
@@ -1331,96 +1364,96 @@ msgstr "format: atome %%(end) manquant"
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: remote.c:745
+#: remote.c:746
#, 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:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1695
+#: remote.c:1696
#, 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:1710
+#: remote.c:1711
#, 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:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1736
+#: remote.c:1737
#, 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:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:2073
+#: remote.c:2074
#, 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:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1432,11 +1465,11 @@ msgstr[1] ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1451,21 +1484,21 @@ msgstr[1] ""
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2114
+#: remote.c:2115
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"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2134
+#: revision.c:2145
#, 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:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
@@ -1516,7 +1549,7 @@ msgstr ""
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Impossible d'écrire dans %s"
@@ -1676,12 +1709,12 @@ msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
msgid "Could not create sequencer directory %s"
msgstr "Impossible de créer le répertoire de séquenceur %s"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Erreur lors de l'emballage de %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
@@ -1693,63 +1726,72 @@ msgstr "impossible de résoudre HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "impossible d'ouvrir %s : %s"
+msgid "cannot open %s"
+msgstr "impossible d'ouvrir %s"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "impossible de lire %s : %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:888
+#: sequencer.c:887
#, 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:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Impossible de formater %s."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "Impossible d'annuler en tant que commit initial"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "Impossible de picorer vers une HEAD vide"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Version attendue du dépôt git <= %d, %d trouvée"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensions de dépôt inconnues trouvées :"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1780,32 +1822,41 @@ msgstr ""
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
# ici %s est un chemin
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Valeur invalide pour %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1865,7 +1916,219 @@ msgstr "impossible de renommer un fichier temporaire en %s"
msgid "Could not read ref %s"
msgstr "impossible de lire la réf %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"%%sVeuillez valider ou remiser vos modifications avant la fusion."
+
+#: unpack-trees.c:71
+#, 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"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%sVeuillez valider ou remiser vos modifications avant %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par %s :\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"%%sVeuillez renommer ou effacer ces fichiers avant %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Les fichiers suivants non suivis seraient écrasés par %s :\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Abandon\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "Extraction des fichiers"
@@ -1903,201 +2166,197 @@ msgstr "segment de chemin '..' invalide"
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "impossible d'accéder à '%s' : %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
"dans la copie de travail)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "bogue : état de non-fusion non géré %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bogue : état de diff non géré %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2105,39 +2364,39 @@ msgstr ""
"Ne touchez pas à la ligne ci-dessus\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
@@ -2286,43 +2545,43 @@ msgstr "Vous êtes en cours de bissection."
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:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2334,32 +2593,32 @@ msgstr ""
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2368,57 +2627,57 @@ 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:1522
+#: wt-status.c:1544
#, 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:1525
+#: wt-status.c:1547
#, 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:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, 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:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Validation initiale sur "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
# à priori on parle d'une branche ici
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "disparue"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "devant "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -2432,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..."
msgid "unexpected diff status %c"
msgstr "status de diff inattendu %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
@@ -2445,7 +2704,7 @@ msgstr "suppression de '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
@@ -2482,14 +2741,14 @@ msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
@@ -2497,7 +2756,7 @@ msgstr "mode verbeux"
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
@@ -2569,16 +2828,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
@@ -2606,16 +2865,6 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'"
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "impossible d'ouvrir '%s' en lecture : %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "impossible d'ouvrir '%s' en écriture : %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2625,78 +2874,78 @@ msgstr "impossible d'analyser le patch '%s'"
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:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, 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:1189
+#: builtin/am.c:1188
#, 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:1190
+#: builtin/am.c:1189
#, 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:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
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:1633
+#: builtin/am.c:1632
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:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2704,38 +2953,38 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -2743,35 +2992,35 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
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:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2782,7 +3031,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2790,17 +3039,17 @@ msgstr ""
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2808,154 +3057,156 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
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:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
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:2267
+#: builtin/am.c:2266
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:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "action"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "racine"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "chemin"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "num"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
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:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
-msgstr "id de clé"
+msgstr "id-clé"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2963,17 +3214,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:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, 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:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2982,7 +3233,7 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
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 "
@@ -3017,44 +3268,44 @@ msgstr "regexec a retourné %d pour l'entrée : %s"
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3069,77 +3320,77 @@ 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)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, 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"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3148,330 +3399,340 @@ msgstr ""
"pendant la recherche de :\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, 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é)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "échec de la lecture de %s"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, 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)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, 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"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "erreur interne"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "impossible d'ouvrir %s : %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Chemin '%s' non traité."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
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"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
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"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
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"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
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"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
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"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
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"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
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"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "ouverture impossible du patch '%s'"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, 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"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3537,104 +3798,104 @@ msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
msgid "Blaming lines"
msgstr "Assignation de blâme au lignes"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
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:2531
+#: builtin/blame.c:2532
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:2532
+#: builtin/blame.c:2533
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:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
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:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
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:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
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:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "score"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
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"
@@ -3645,32 +3906,32 @@ msgstr ""
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3679,7 +3940,7 @@ msgstr ""
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3688,12 +3949,12 @@ msgstr ""
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3702,301 +3963,322 @@ msgstr ""
"La branche '%s' n'est pas totalement fusionnée.\n"
"Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
# féminin pour une branche
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: disparue]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: en retard de %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[en retard de %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s : en avance de %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[en avance de %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s : en avance de %d, en retard de %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[en avance de %d, en retard de %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** référence invalide ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(aucune branche)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "La branche %s est en cours de rebasage sur %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "La branche %s est en cours de bissection sur %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "impossible d'écrire le modèle de description de branche : %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "impossible d'écrire le modèle de description de branche"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "amont"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "modifier l'information amont"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "clé"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "objet"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "trop de branches pour une opération de renommage"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "trop de branches pour spécifier une branche amont"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -4004,41 +4286,41 @@ msgstr ""
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "trop de branches pour désactiver un amont"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4047,7 +4329,7 @@ msgstr ""
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -4058,16 +4340,6 @@ msgstr ""
"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4169,7 +4441,7 @@ 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:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -4261,8 +4533,9 @@ msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "chaîne"
@@ -4312,81 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner"
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, 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:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, 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:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "fichier d'index corrompu"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4409,7 +4682,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4438,151 +4711,151 @@ msgstr[1] ""
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, 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:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, 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:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "détacher la HEAD à la validation nommée"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (fusion ou diff3)"
+msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
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:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
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:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4592,12 +4865,12 @@ msgstr ""
"en même temps.\n"
"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, 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:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4749,8 +5022,8 @@ msgstr "nettoyage interactif"
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "motif"
@@ -4790,103 +5063,112 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "nombre de sous-modules clonés en parallèle"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "tous les sous-modules clonés seront superficiels"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4894,59 +5176,54 @@ 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:305
+#: builtin/clone.c:307
#, 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é."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, 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."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "échec du stat de '%s'"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4956,130 +5233,130 @@ msgstr ""
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Vérification de la connectivité... "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
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:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, 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:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, 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:925
+#: builtin/clone.c:939
#, 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:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
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:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, 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:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -5222,66 +5499,66 @@ msgstr ""
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5289,38 +5566,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:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, 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:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "impossible de lire MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "impossible de lire MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5335,7 +5612,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5350,7 +5627,7 @@ msgstr ""
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5360,7 +5637,7 @@ msgstr ""
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5371,150 +5648,150 @@ 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:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, 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:1055
+#: builtin/commit.c:1066
#, 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:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
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:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
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:1154
+#: builtin/commit.c:1165
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:1164
+#: builtin/commit.c:1175
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:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
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:1191
+#: builtin/commit.c:1202
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:1193
+#: builtin/commit.c:1204
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:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Malin... correction du dernier avec un index sale."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "afficher le statut avec concision"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "afficher le statut en format long (par défaut)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
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:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5522,201 +5799,201 @@ msgstr ""
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "date"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "message"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
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:1586
+#: builtin/commit.c:1602
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:1587
+#: builtin/commit.c:1603
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:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "inclure le statut dans le modèle de message de validation"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "éviter d'utiliser le crochet pre-commit"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, 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:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abandon de la validation du à un message de validation vide\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5865,7 +6142,7 @@ msgstr ""
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5880,7 +6157,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
@@ -5916,7 +6193,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
@@ -6011,7 +6288,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
@@ -6045,21 +6322,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
@@ -6133,19 +6410,19 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
-msgstr "récupérer depuis tous le dépôts distants"
+msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
@@ -6153,7 +6430,7 @@ msgstr "forcer l'écrasement de la branche locale"
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
@@ -6165,21 +6442,21 @@ msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
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:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
@@ -6187,17 +6464,17 @@ msgstr "conserver le paquet téléchargé"
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
-msgstr "dir"
+msgstr "répertoire"
#: builtin/fetch.c:123
msgid "prepend this to submodule path output"
@@ -6207,15 +6484,15 @@ msgstr "préfixer ceci à la sortie du chemin du sous-module"
msgid "default mode for recursion"
msgstr "mode par défaut pour la récursion"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
@@ -6273,11 +6550,6 @@ msgstr "mise à jour forcée"
msgid "(non-fast-forward)"
msgstr "(pas d'avance rapide)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "impossible d'ouvrir %s : %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6480,56 +6752,56 @@ msgstr "Vérification de la connectivité"
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
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:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Vérification des objets"
@@ -6637,223 +6909,223 @@ msgstr "impossible de lire l'arbre (%s)"
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
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:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
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:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
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:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
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:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
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:899
+#: builtin/grep.c:901
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:904
+#: builtin/grep.c:906
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:907
+#: builtin/grep.c:909
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:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -6944,8 +7216,8 @@ msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "échec de l'exécution de '%s' : %s"
+msgid "failed to exec '%s'"
+msgstr "échec de l'exécution de '%s'"
#: builtin/help.c:205
#, c-format
@@ -7204,108 +7476,110 @@ msgstr "confusion extrême"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "complété avec %d objets locaux"
+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:1263
+#: builtin/index-pack.c:1265
#, 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:1267
+#: builtin/index-pack.c:1269
#, 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:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, 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:1587
+#: builtin/index-pack.c:1589
#, 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:1594
+#: builtin/index-pack.c:1596
#, 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:1624
+#: builtin/index-pack.c:1609
+#, 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:1638
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, 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:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
@@ -7344,28 +7618,27 @@ msgstr "impossible de copier '%s' vers '%s'"
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "modèles non trouvés %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "pas de copie des modèles depuis '%s' : %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
@@ -7373,24 +7646,24 @@ msgstr "impossible de déplacer %s vers %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "existant réinitialisé"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "vide initialisé"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " partagé"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7398,25 +7671,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7425,7 +7698,7 @@ msgstr ""
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -7471,268 +7744,319 @@ msgstr "git show [<options>] <objet>..."
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:137
+#: builtin/log.c:143
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:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format e-mail"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit inconnu %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Impossible de résoudre '%s' comme une référence valide."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Impossible de trouver la base de fusion exacte."
+
+#: builtin/log.c:1235
+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 ""
+"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n"
+"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n"
+"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Impossible de trouver la base de fusion exacte"
+
+#: builtin/log.c:1266
+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:1270
+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:1319
+msgid "cannot get patch id"
+msgstr "impossible d'obtenir l'id du patch"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
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:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
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:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
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:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
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:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "commit-de-base"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "Ajouter un arbre prérequis à la série de patchs"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7740,11 +8064,6 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit inconnu %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
@@ -7942,175 +8261,179 @@ msgstr "git merge [<options>] <message> HEAD <commit>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
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:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
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:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
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:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Vérifier que la validation a une signature GPG valide"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
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:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "permettre la fusion d'historiques sans rapport"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Impossible d'écrire dans '%s'"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "Écriture de SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Finition de SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, 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:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
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.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8127,54 +8450,54 @@ msgstr ""
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, 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:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' n'est pas une validation"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
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:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
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:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8182,7 +8505,7 @@ msgstr ""
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8190,102 +8513,106 @@ msgstr ""
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
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:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
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:1267
+#: builtin/merge.c:1279
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:1269
+#: builtin/merge.c:1281
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:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
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:1332
+#: builtin/merge.c:1344
#, 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."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, 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."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, 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"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "refus de fusionner des historiques sans relation"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, 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:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, 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:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8396,7 +8723,7 @@ msgstr "git mv [<options>] <source>... <destination>"
msgid "Directory %s is in index and no submodule?"
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
@@ -8476,49 +8803,49 @@ msgstr "%s, source=%s, destination=%s"
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
@@ -8666,24 +8993,16 @@ msgstr "impossible d'écrire l'objet note"
msgid "The note contents have been left in %s"
msgstr "Le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Impossible de résoudre '%s' comme une référence valide."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8696,7 +9015,7 @@ msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "trop de paramètres"
@@ -8743,7 +9062,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
@@ -8784,15 +9103,15 @@ msgstr ""
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8800,50 +9119,50 @@ msgstr ""
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
@@ -8867,175 +9186,179 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+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:776
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
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:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
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:2599
+#: builtin/pack-objects.c:2604
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:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
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:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
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:2614
+#: builtin/pack-objects.c:2619
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:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
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:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
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:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
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:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
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:2661
+#: builtin/pack-objects.c:2666
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:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "Décompte des objets"
@@ -9063,15 +9386,15 @@ msgstr "Suppression des objets dupliqués"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
@@ -9083,51 +9406,55 @@ msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "remiser avant et réappliquer après le rebasage automatiquement"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"impossible de tirer avec rebasage. Vous avez des modifications non indexées."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "De plus, votre index contient des modifications non validées."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"impossible de tirer avec rebasage : votre index contient des modifications "
"non validées."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9135,14 +9462,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:445
+#: builtin/pull.c:465
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:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9150,7 +9477,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:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9162,39 +9489,42 @@ msgstr ""
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 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:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 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:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<distant>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<branche>"
+
+#: builtin/pull.c:489 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:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
-msgstr ""
-"Si vous souhaitez indiquer l'information de suivi distant pour cette "
-"branche, vous pouvez le faire avec :\n"
-"\n"
-" git branch --set-upstream-to=%s/<branche> %s\n"
+"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:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9204,13 +9534,17 @@ msgstr ""
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
+
+#: builtin/pull.c:872
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:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9221,7 +9555,7 @@ msgstr ""
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9239,11 +9573,11 @@ msgstr ""
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
@@ -9622,6 +9956,18 @@ msgstr "sauter l'application du filtre d'extraction creuse"
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <répertoire-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "quiet"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Vous devez spécifier un répertoire."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9953,21 +10299,23 @@ msgstr "* distante %s"
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(pas d'URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -9975,158 +10323,158 @@ msgstr ""
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (statut non demandé)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
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:1199
+#: builtin/remote.c:1201
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:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
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:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
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:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
@@ -10642,12 +10990,6 @@ msgstr "autoriser la suppression récursive"
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un statut zéro même si rien ne correspondait"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
-"continuer"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10809,11 +11151,11 @@ msgstr "git show-ref --exclude-existing[=<motif>]"
#: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)"
-msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)"
+msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
#: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)"
-msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)"
+msgstr "afficher seulement les têtes (peut être combiné avec tags)"
#: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path"
@@ -10862,86 +11204,180 @@ 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:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Référence inexistante : %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Nom de référence complet attendu, %s obtenu"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "impossible de supprimer un composant de l'URL '%s'"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, 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:366
+#, 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:370
+#, 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:380
+#, 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:387
+#, 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:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<chemin>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, 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:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
-"<dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] "
-"[<chemin>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, 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:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "impossible de fermer le fichier %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, 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:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"fatal : la sous-commande submodule--helper doit être appelée avec une sous-"
-"commande"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Sous-module non fusionné %s non traité"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Sous-module '%s' non traité"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "chemin dans la copie de travail"
+
+#: builtin/submodule--helper.c:771
+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:775
+msgid "rebase, merge, checkout or none"
+msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:779
+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:782
+msgid "parallel jobs"
+msgstr "jobs parallèles"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "ne pas afficher la progression du clonage"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "valeur invalide pour la mise à jour du paramètre"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "la sous-commande submodule--helper doit être appelée avec une sous-commande"
+
+#: builtin/submodule--helper.c:862
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal : '%s' n'est pas une sous-commande valide de submodule--helper"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10996,27 +11432,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nométiquette>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "nom d'étiquette trop long : %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "impossible de vérifier l'étiquette '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -11029,7 +11460,7 @@ msgstr ""
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -11161,21 +11592,21 @@ msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l"
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -11438,7 +11869,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..."
msgid "print commit contents"
msgstr "afficher le contenu du commit"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "afficher les messages bruts de gpg"
@@ -11458,7 +11889,7 @@ msgstr "afficher seulement les statistiques"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <étiquette>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
@@ -11474,73 +11905,77 @@ msgstr "git worktree prune [<options>]"
msgid "git worktree list [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, 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:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, 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:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "échec de la suppression de %s"
+msgid "failed to remove '%s'"
+msgstr "échec de la suppression de '%s'"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
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:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "remplissage de la nouvelle copie de travail"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
@@ -11560,7 +11995,7 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
@@ -11574,7 +12009,7 @@ msgstr ""
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
@@ -11706,7 +12141,7 @@ msgstr "être plus silencieux"
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
@@ -11926,16 +12361,16 @@ msgstr ""
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11945,33 +12380,29 @@ msgstr ""
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "L'option --exec doit être utilisée avec l'option --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
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."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11979,12 +12410,12 @@ msgstr ""
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -12006,65 +12437,65 @@ msgstr ""
"chose\n"
"d'important ici."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -12208,28 +12639,23 @@ msgstr "Aucune branche spécifiée"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "impossible de supprimer un composant de l'URL '$remoteurl'"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
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:291
+#: git-submodule.sh:229
#, 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:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12240,24 +12666,24 @@ msgstr ""
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, 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:332
+#: git-submodule.sh:270
#, 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:340
+#: git-submodule.sh:278
#, 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:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -12265,7 +12691,7 @@ msgstr ""
"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
"nouveau depuis"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
@@ -12273,7 +12699,7 @@ msgstr ""
"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
"correct"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -12282,74 +12708,53 @@ msgstr ""
"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
"l'option '--name'."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, 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:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Entrée dans '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
-#: git-submodule.sh:483
+#: git-submodule.sh:448
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules"
+msgid "pathspec and --all are incompatible"
+msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:492
+#: git-submodule.sh:453
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr ""
-"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
-"'$displaypath'"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr ""
-"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"La copie de travail du sous-module '$displaypath' contient un répertoire .git"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12357,7 +12762,7 @@ msgstr ""
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12366,146 +12771,181 @@ msgstr ""
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Chemin de sous-module '$displaypath' non initialisé\n"
-"Peut-être souhaitez-vous utiliser 'update --init' ?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, 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:745
+#: git-submodule.sh:644
#, 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:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, 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:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, 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:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, 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:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
-"'$prefix$sm_path'"
+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:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
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:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, 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:1019
+#: git-submodule.sh:912
#, 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:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s' : %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "impossible d'accéder à '%s' : %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "impossible d'ouvrir '%s' en lecture : %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "impossible d'ouvrir '%s' en écriture : %s"
+
+#~ msgid " git branch -d %s\n"
+#~ msgstr " git branch -d %s\n"
+
+#~ msgid " git branch --set-upstream-to %s\n"
+#~ msgstr " git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "impossible d'ouvrir %s : %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
+#~ "continuer"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "impossible de vérifier l'étiquette '%s'"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "échec de la suppression de %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Chemin de sous-module '$displaypath' non initialisé\n"
+#~ "Peut-être souhaitez-vous utiliser 'update --init' ?"
+
#~ msgid "Forward-port local commits to the updated upstream head"
#~ msgstr ""
#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
@@ -12578,9 +13018,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
#~ msgid "Could not append '%s'"
#~ msgstr "Impossible d'ajouter '%s'"
-#~ msgid "Could not set '%s'"
-#~ msgstr "Impossible de définir '%s'"
-
#~ msgid "Missing author: %s"
#~ msgstr "Auteur manquant : %s"
@@ -12923,12 +13360,5 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
#~ msgstr "les chemins en entrée sont terminés par le caractère nul"
#~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être "
-#~ "supprimés par le remisage :"
-
-#~ msgid ""
#~ "Aborting. Consider using either the --force or --include-untracked option."
#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
diff --git a/po/git.pot b/po/git.pot
index 72ef798..c9be5df 100644
--- a/po/git.pot
+++ b/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: 2016-03-16 00:16+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+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"
@@ -29,7 +29,7 @@ msgid ""
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
@@ -71,7 +71,7 @@ msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr ""
@@ -79,9 +79,9 @@ msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -115,7 +115,8 @@ msgstr ""
msgid "list supported archive formats"
msgstr ""
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr ""
@@ -251,11 +252,16 @@ msgstr ""
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr ""
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -266,7 +272,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -275,10 +281,10 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr ""
@@ -317,21 +323,21 @@ msgstr ""
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr ""
@@ -340,8 +346,8 @@ msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -375,21 +381,21 @@ msgstr ""
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr ""
@@ -408,9 +414,14 @@ msgstr ""
msgid "%s has multiple values"
msgstr ""
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr ""
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not unset '%s'"
msgstr ""
#: connected.c:69
@@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'"
msgstr ""
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
+msgid "failed write to rev-list"
msgstr ""
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
msgstr ""
#: date.c:95
@@ -500,62 +509,62 @@ msgstr[1] ""
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr ""
@@ -569,12 +578,12 @@ msgstr ""
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
+msgid "could not create temporary file '%s'"
msgstr ""
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
+msgid "failed writing detached signature to '%s'"
msgstr ""
#: grep.c:1718
@@ -582,14 +591,14 @@ msgstr ""
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
+msgid "failed to stat '%s'"
msgstr ""
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
+msgid "'%s': short read"
msgstr ""
#: help.c:205
@@ -648,12 +657,29 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr ""
+#: lockfile.c:152
+#, 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 ""
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr ""
+
#: merge.c:41
msgid "failed to read the cache"
msgstr ""
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr ""
@@ -700,7 +726,7 @@ msgstr ""
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr ""
@@ -827,7 +853,7 @@ msgstr ""
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr ""
@@ -854,50 +880,50 @@ msgstr ""
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr ""
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr ""
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr ""
@@ -927,28 +953,28 @@ msgstr ""
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr ""
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr ""
@@ -957,7 +983,7 @@ msgstr ""
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
@@ -1022,7 +1048,7 @@ msgid ""
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr ""
@@ -1044,23 +1070,23 @@ msgid ""
"Using version %i"
msgstr ""
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr ""
@@ -1199,93 +1225,93 @@ msgstr ""
msgid "malformed object name %s"
msgstr ""
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr ""
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1695
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1710
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2073
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: remote.c:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1293,11 +1319,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1308,20 +1334,20 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2114
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr ""
@@ -1365,7 +1391,7 @@ msgid ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr ""
@@ -1523,12 +1549,12 @@ msgstr ""
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr ""
@@ -1540,63 +1566,72 @@ msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
+msgid "cannot open %s"
msgstr ""
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:888
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr ""
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr ""
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr ""
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr ""
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1614,29 +1649,38 @@ msgid ""
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr ""
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr ""
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr ""
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1696,7 +1740,175 @@ msgstr ""
msgid "Could not read ref %s"
msgstr ""
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr ""
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr ""
@@ -1734,230 +1946,226 @@ msgstr ""
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr ""
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr ""
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr ""
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr ""
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr ""
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr ""
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr ""
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr ""
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr ""
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr ""
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr ""
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr ""
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr ""
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr ""
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr ""
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr ""
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr ""
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr ""
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr ""
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr ""
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
@@ -2096,43 +2304,43 @@ msgstr ""
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr ""
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2140,82 +2348,82 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr ""
-#: wt-status.c:1513
+#: wt-status.c:1535
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr ""
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr ""
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -2229,7 +2437,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr ""
@@ -2242,7 +2450,7 @@ msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr ""
@@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr ""
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr ""
@@ -2293,7 +2501,7 @@ msgstr ""
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr ""
@@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr ""
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr ""
@@ -2398,16 +2606,6 @@ msgstr ""
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr ""
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr ""
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2417,109 +2615,109 @@ msgstr ""
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1189
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1190
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1631
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr ""
@@ -2527,231 +2725,233 @@ msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1944
+#: builtin/am.c:1943
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:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr ""
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2267
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr ""
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr ""
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr ""
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr ""
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr ""
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr ""
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
@@ -2784,37 +2984,37 @@ msgstr ""
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2825,396 +3025,406 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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] ""
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr ""
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr ""
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3280,99 +3490,99 @@ msgstr ""
msgid "Blaming lines"
msgstr ""
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr ""
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@ -3382,392 +3592,413 @@ msgstr ""
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, 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 ""
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr ""
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr ""
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
msgstr ""
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr ""
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr ""
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3775,16 +4006,6 @@ msgid ""
"\n"
msgstr ""
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr ""
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr ""
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -3880,7 +4101,7 @@ msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr ""
@@ -3970,8 +4191,9 @@ msgid "write the content to temporary files"
msgstr ""
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr ""
@@ -4021,79 +4243,79 @@ msgstr ""
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4108,7 +4330,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4125,162 +4347,162 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr ""
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4410,8 +4632,8 @@ msgstr ""
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
@@ -4447,286 +4669,290 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
msgid "depth"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -4829,103 +5055,103 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
+#: builtin/commit.c:737 builtin/commit.c:745
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:734
-msgid "could not read SQUASH_MSG"
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:785
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -4935,7 +5161,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -4945,14 +5171,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, 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:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -4960,341 +5186,341 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr ""
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr ""
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr ""
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr ""
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr ""
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5437,7 +5663,7 @@ msgstr ""
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5447,7 +5673,7 @@ msgid ""
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
@@ -5483,7 +5709,7 @@ msgstr ""
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr ""
@@ -5570,7 +5796,7 @@ msgstr ""
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr ""
@@ -5604,21 +5830,21 @@ msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@ -5691,19 +5917,19 @@ msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr ""
@@ -5711,7 +5937,7 @@ msgstr ""
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr ""
@@ -5723,19 +5949,19 @@ msgstr ""
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr ""
@@ -5743,15 +5969,15 @@ msgstr ""
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr ""
@@ -5763,15 +5989,15 @@ msgstr ""
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr ""
@@ -5829,11 +6055,6 @@ msgstr ""
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr ""
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6028,55 +6249,55 @@ msgstr ""
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr ""
@@ -6170,214 +6391,214 @@ msgstr ""
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr ""
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr ""
@@ -6464,7 +6685,7 @@ msgstr ""
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
+msgid "failed to exec '%s'"
msgstr ""
#: builtin/help.c:205
@@ -6719,107 +6940,109 @@ msgstr ""
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr ""
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr ""
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr ""
@@ -6858,27 +7081,27 @@ msgstr ""
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr ""
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr ""
@@ -6886,55 +7109,55 @@ msgstr ""
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr ""
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr ""
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr ""
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
@@ -6978,273 +7201,316 @@ msgstr ""
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr ""
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr ""
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr ""
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1235
+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:1255
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr ""
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr ""
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr ""
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr ""
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr ""
-#: builtin/log.c:1258
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr ""
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr ""
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr ""
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr ""
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
@@ -7432,170 +7698,174 @@ msgstr ""
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr ""
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr ""
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7605,157 +7875,161 @@ msgid ""
"the commit.\n"
msgstr ""
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -7863,7 +8137,7 @@ msgstr ""
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
@@ -7941,48 +8215,48 @@ msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr ""
@@ -8123,24 +8397,16 @@ msgstr ""
msgid "The note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr ""
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8153,7 +8419,7 @@ msgstr ""
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr ""
@@ -8198,7 +8464,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
@@ -8234,63 +8500,63 @@ msgid ""
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr ""
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@ -8310,165 +8576,169 @@ msgstr ""
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr ""
@@ -8496,15 +8766,15 @@ msgstr ""
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr ""
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr ""
@@ -8516,65 +8786,69 @@ msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -8582,46 +8856,57 @@ msgid ""
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, 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:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -8629,7 +8914,7 @@ msgid ""
"commit %s."
msgstr ""
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -8640,11 +8925,11 @@ msgid ""
"to recover."
msgstr ""
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr ""
@@ -8950,6 +9235,18 @@ msgstr ""
msgid "debug unpack-trees"
msgstr ""
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr ""
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9261,176 +9558,178 @@ msgstr ""
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr ""
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr ""
@@ -9916,10 +10215,6 @@ msgstr ""
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10112,78 +10407,177 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr ""
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr ""
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr ""
+
+#: builtin/submodule--helper.c:862
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
#: builtin/symbolic-ref.c:7
@@ -10234,27 +10628,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr ""
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr ""
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10263,7 +10652,7 @@ msgid ""
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10390,21 +10779,21 @@ msgstr ""
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr ""
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -10652,7 +11041,7 @@ msgstr ""
msgid "print commit contents"
msgstr ""
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr ""
@@ -10672,7 +11061,7 @@ msgstr ""
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr ""
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr ""
@@ -10688,68 +11077,72 @@ msgstr ""
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
+msgid "failed to remove '%s'"
msgstr ""
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
@@ -10769,7 +11162,7 @@ msgstr ""
msgid "only useful for debugging"
msgstr ""
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
@@ -10780,7 +11173,7 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
@@ -10908,7 +11301,7 @@ msgstr ""
msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
@@ -11101,58 +11494,54 @@ msgid ""
"\"."
msgstr ""
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:169
+#: git-rebase.sh:172
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 ""
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr ""
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11165,64 +11554,64 @@ msgid ""
"valuable there."
msgstr ""
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
@@ -11364,26 +11753,21 @@ msgstr ""
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr ""
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11391,235 +11775,217 @@ msgid ""
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr ""
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:437
+#: git-submodule.sh:355
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Entering '$displaypath'"
msgstr ""
-#: git-submodule.sh:483
+#: git-submodule.sh:375
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: git-submodule.sh:492
+#: git-submodule.sh:448
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
+msgid "pathspec and --all are incompatible"
msgstr ""
-#: git-submodule.sh:494
+#: git-submodule.sh:453
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:745
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr ""
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 3ff3b9b..c9f431c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -57,8 +57,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-16 10:30+0900\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-12 01:20+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
@@ -81,7 +81,7 @@ msgstr ""
"ìž‘ì—… í´ë”ì—ì„œ 문제를 ë°”ë¡œìž¡ì€ ë‹¤ìŒ, 'git add/rm <파ì¼>'ì„ ì ì ˆížˆ\n"
"사용해 해결 표시하고 커밋하십시오."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "병합 ìž‘ì—…ì„ ë‹¤ 마치지 않았습니다 (MERGE_HEAD 파ì¼ì´ 있습니다)."
@@ -125,7 +125,7 @@ msgstr "형ì‹"
msgid "archive format"
msgstr "압축 형ì‹"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "ì ‘ë‘ì–´"
@@ -133,9 +133,9 @@ msgstr "ì ‘ë‘ì–´"
msgid "prepend prefix to each pathname in the archive"
msgstr "ì•„ì¹´ì´ë¸Œì˜ ê° ê²½ë¡œ ì´ë¦„ì˜ ì•žì— ì§€ì •í•œ 경로를 붙입니다"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -169,7 +169,8 @@ msgstr "ë” ìž‘ê²Œ 압축"
msgid "list supported archive formats"
msgstr "지ì›í•˜ëŠ” 압축 형ì‹ì˜ 목ë¡ì„ 표시합니다"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "저장소"
@@ -323,11 +324,16 @@ msgstr "애매한 오브ì íŠ¸ ì´ë¦„: '%s'."
msgid "Not a valid branch point: '%s'."
msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s'ì€(는) ì´ë¯¸ '%s' ìœ„ì¹˜ì— ë°›ì•„ì ¸ 있습니다"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "ìž‘ì—… í´ë” %sì˜ í—¤ë“œê°€ ì—…ë°ì´íŠ¸ë˜ì§€ 않았습니다"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -338,7 +344,7 @@ msgstr "'%s' 파ì¼ì´ 버전2 번들 파ì¼ë¡œ ë³´ì´ì§€ 않습니다"
msgid "unrecognized header: %s%s (%d)"
msgstr "ì¸ì‹í•  수 없는 í—¤ë”: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "'%s'ì„(를) ì—´ 수 없습니다"
@@ -347,10 +353,10 @@ msgstr "'%s'ì„(를) ì—´ 수 없습니다"
msgid "Repository lacks these prerequisite commits:"
msgstr "ì €ìž¥ì†Œì— í•„ìˆ˜ì ì¸ ë‹¤ìŒ ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "리비전 walk 준비가 실패했습니다"
@@ -387,21 +393,21 @@ msgstr "rev-list ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "rev-list 옵션ì—ì„œ '%s' ë ˆí¼ëŸ°ìŠ¤ê°€ 제외ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "ì•Œ 수 없는 ì¸ìž: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "빈 ë²ˆë“¤ì€ ë§Œë“¤ì§€ 않습니다."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "'%s'ì„(를) 만들 수 없습니다"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "index-pack ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
@@ -410,8 +416,8 @@ msgstr "index-pack ëª…ë ¹ì´ ì£½ì—ˆìŠµë‹ˆë‹¤"
msgid "invalid color value: %.*s"
msgstr "ìž˜ëª»ëœ ìƒ‰ ê°’: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "parse %sì„(를) 파싱할 수 없습니다"
@@ -445,21 +451,21 @@ msgstr "ìž˜ëª»ëœ ìˆ˜ì¹˜ 설정 ê°’ '%s' (키 '%s'): %s"
msgid "failed to expand user dir in: '%s'"
msgstr "다ìŒì— ì‚¬ìš©ìž ë””ë ‰í„°ë¦¬ í™•ìž¥ì— ì‹¤íŒ¨: '%s'"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "%dë²ˆì€ ì˜¬ë°”ë¥¸ zlib 압축 단계가 아닙니다"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "오브ì íŠ¸ ìƒì„± 모드가 올바르지 않습니다: %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "명령행 ì„¤ì •ì„ íŒŒì‹±í•  수 없습니다"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "설정 파ì¼ì„ ì½ëŠ” 중 ì•Œ 수 없는 오류가 ìƒê²¼ìŠµë‹ˆë‹¤"
@@ -478,24 +484,27 @@ msgstr "'%2$s' 파ì¼ì˜ %3$d번 줄 '%1$s' 설정 변수가 잘못ë˜ì—ˆìŠµë‹ˆë
msgid "%s has multiple values"
msgstr "%sì€(는) 여러 ê°œ ê°’ì´ ìžˆìŠµë‹ˆë‹¤"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "'%s'ì„(를) '%s'(으)ë¡œ 설정할 수 없습니다"
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "'%s'ì„(를) '%s'ì— ì„¤ì •í•  수 없습니다"
+msgid "could not unset '%s'"
+msgstr "'%s' ì„¤ì •ì„ ì§€ìš¸ 수 없습니다"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list'를 실행할 수 없습니다"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "rev-list ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+msgid "failed write to rev-list"
+msgstr "rev-list ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "rev-listì˜ í‘œì¤€ìž…ë ¥ì„ ë‹«ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "rev-listì˜ í‘œì¤€ìž…ë ¥ì„ ë‹«ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
#: date.c:95
msgid "in the future"
@@ -561,26 +570,26 @@ msgstr[0] "%luë…„ ì „"
msgid "failed to read orderfile '%s'"
msgstr "'%s' 순서 파ì¼ì„ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "부정확한 ì´ë¦„ 바꾸기 íƒìƒ‰ì„ 수행하는 중"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat ìžë¦„ í¼ì„¼íŠ¸ ê°’ '%s' íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " ì•Œ 수 없는 dirstat 파ë¼ë¯¸í„° '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' 설정 ë³€ìˆ˜ì— ì•Œ 수 없는 ê°’: '%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -589,16 +598,16 @@ msgstr ""
"'diff.submodule' 설정 ë³€ìˆ˜ì— ì˜¤ë¥˜:\n"
"%s'"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "외부 diff í”„ë¡œê·¸ëž¨ì´ ì£½ìŒ, %s 위치ì—ì„œ 멈춤"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow 옵션ì—는 정확히 í•˜ë‚˜ì˜ ê²½ë¡œëª…ì„¸ê°€ 필요합니다"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -607,20 +616,20 @@ msgstr ""
"--dirstat/-X 옵션 파ë¼ë¯¸í„°ë¥¼ íŒŒì‹±í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "--submodule 옵션 파ë¼ë¯¸í„° íŒŒì‹±ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: '%s'"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "ì»¤ë„ ì´ë¦„ê³¼ 정보를 ê°€ì ¸ì˜¤ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr "ì´ ì‹œìŠ¤í…œ ë˜ëŠ” 위치ì—서는 추ì ë˜ì§€ 않는 ìºì‹œë¥¼ 사용하지 않습니다."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "gpg를 실행할 수 없습니다."
@@ -634,28 +643,28 @@ msgstr "gpgì—ì„œ ë°ì´í„°ë¥¼ ì„œëª…í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "ìž„ì‹œ íŒŒì¼ '%s'ì„(를) 만들 수 없습니다: %s"
+msgid "could not create temporary file '%s'"
+msgstr "'%s' ìž„ì‹œ 파ì¼ì„ 만들 수 없습니다"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "ë¶„ë¦¬ëœ ì„œëª…ì„ '%s'ì— ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "ë¶„ë¦¬ëœ ì„œëª…ì„ '%s'ì— ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %sì„(를) ì½ì„ 수 없습니다"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': %sì—ì„œ ì½ë‹¤ê°€ 잘림"
+msgid "'%s': short read"
+msgstr "'%s': ì½ë‹¤ê°€ 잘림"
#: help.c:205
#, c-format
@@ -718,12 +727,36 @@ msgstr[0] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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"
+"ì´ ì €ìž¥ì†Œì—ì„œ 다른 깃 프로세스가 실행 ì¤‘ì¸ ê²ƒìœ¼ë¡œ 보입니다. (예를\n"
+"들어 'git commit' 명령으로 편집기가 열려 있다든지.) 모든 프로세스를\n"
+"ë냈는지 확ì¸í•˜ì‹œê³  다시 ì‹œë„í•´ 보십시오. ê·¸ëž˜ë„ ê³„ì† ì‹¤íŒ¨í•˜ë©´, ì´\n"
+"저장소ì—ì„œ 깃 프로세스가 ì „ì— ì´ìƒ ì¢…ë£Œí–ˆì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤:\n"
+"수ë™ìœ¼ë¡œ 해당 파ì¼ì„ 제거하고 계ì†í•˜ì‹­ì‹œì˜¤."
+
+#: lockfile.c:160
+#, 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:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
@@ -770,7 +803,7 @@ msgstr "%s '%s' 오브ì íŠ¸ë¥¼ ì½ì„ 수 ì—†ìŒ"
msgid "blob expected for %s '%s'"
msgstr "%s '%s'ì— ëŒ€í•´ ë¸”ë¡­ì„ ì˜ˆìƒ"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "'%s'ì„(를) ì—¬ëŠ”ë° ì‹¤íŒ¨"
@@ -904,7 +937,7 @@ msgstr "건너뛰기: %s (기존과 같게 병합)"
msgid "Auto-merging %s"
msgstr "ìžë™ 병합: %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "하위 모듈"
@@ -933,49 +966,49 @@ msgstr ""
"충ëŒ! (%s): ì´ë¦„ì´ %sì¸ ë””ë ‰í„°ë¦¬ê°€ %sì— ìžˆìŠµë‹ˆë‹¤. %sì„(를) %s(으)ë¡œ 추가합니"
"다"
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "추가: %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "치명ì ì¸ 병합 실패, ì¼ì–´ë‚  수 없는 ìƒí™©."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "ì´ë¯¸ ì—…ë°ì´íŠ¸ ìƒíƒœìž…니다!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s ë° %s íŠ¸ë¦¬ì˜ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "처리ë˜ì§€ ì•Šì€ ê²½ë¡œ??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "병합:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "ê³¼ê±°ì˜ ê³µí†µ 커밋 %uê°œ 발견:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "병합 ê²°ê³¼ì— ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "ì¸ë±ìŠ¤ë¥¼ 쓸 수 없습니다."
@@ -1005,28 +1038,28 @@ msgstr "ìž˜ëª»ëœ %s ê°’: '%s'"
msgid "unable to parse object: %s"
msgstr "오브ì íŠ¸ë¥¼ 파싱할 수 없습니다: %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "사용법: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " ë˜ëŠ”: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-NUM"
@@ -1035,7 +1068,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ 오브ì íŠ¸ ì´ë¦„ '%s'"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "%sì„(를) 그룹ì—ì„œ 쓰기 가능하ë„ë¡ ë§Œë“¤ 수 없습니다"
@@ -1103,7 +1136,7 @@ msgstr ""
":(exclude) 패턴으로 제외할 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤.\n"
"':/' ë˜ëŠ” '.' 추가를 잊으신 것 아닙니까?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "--pretty 형ì‹ì„ 파싱할 수 없습니다"
@@ -1129,23 +1162,23 @@ msgstr ""
"GIT_INDEX_VERSIONì´ ì„¤ì •ë˜ì—ˆì§€ë§Œ, ì´ ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
"%i ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë¥¼ 삭제할 수 없습니다: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ 제거할 수 없습니다"
@@ -1284,103 +1317,103 @@ msgstr "형ì‹: %%(end) ì•„í†°ì´ ì—†ìŠµë‹ˆë‹¤"
msgid "malformed object name %s"
msgstr "ìž˜ëª»ëœ í˜•ì‹ì˜ 오브ì íŠ¸ ì´ë¦„ %s"
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "%s ë° %sì„(를) ëª¨ë‘ %sì— ê°€ì ¸ì˜¬ 수 없습니다"
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%sì€(는) 보통 %sì„(를) 추ì í•˜ê³ , %sì„(를) 추ì í•˜ì§€ 않습니다"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%sì€(는) %s ë° %s ëª¨ë‘ ì¶”ì í•©ë‹ˆë‹¤"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "내부 오류"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD가 브랜치를 가리키지 않습니다"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "그런 브랜치가 없습니다: '%s'"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' ë¸Œëžœì¹˜ì— ëŒ€í•´ ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•˜ì§€ 않았습니다"
-#: remote.c:1695
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "업스트림 '%s' 브랜치가 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¡œ 저장ë˜ì§€ 않았습니다"
-#: remote.c:1710
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "리모트 '%2$s'ì˜ í‘¸ì‹œ ëŒ€ìƒ '%1$s'ì— ë¡œì»¬ ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' ë¸Œëžœì¹˜ì— í‘¸ì‹œ 리모트가 없습니다"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s'ì— ëŒ€í•œ 푸시 ë ˆí¼ëŸ°ìŠ¤ëª…ì„¸ì— '%s'ì´(ê°€) 들어 있지 않습니다"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "í‘¸ì‹œì˜ ëŒ€ìƒì´ 없습니다 (push.defaultê°€ 'nothing'입니다)"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "í•˜ë‚˜ì˜ ëŒ€ìƒì— 대해 'simple' 푸시를 처리할 수 없습니다"
-#: remote.c:2073
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "현재 브랜치가 '%s' 기반ì´ì§€ë§Œ, ì—…ìŠ¤íŠ¸ë¦¼ì´ ì—†ì–´ì¡ŒìŠµë‹ˆë‹¤.\n"
-#: remote.c:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (바로잡으려면 \"git branch --unset-upstream\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "브랜치가 '%s'ì— ë§žê²Œ ì—…ë°ì´íŠ¸ëœ ìƒíƒœìž…니다.\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (ë¡œì»¬ì— ìžˆëŠ” ì»¤ë°‹ì„ ì œì¶œí•˜ë ¤ë©´ \"git push\"를 사용하십시오)\n"
-#: remote.c:2093
+#: remote.c:2094
#, 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:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (로컬 브랜치를 ì—…ë°ì´íŠ¸í•˜ë ¤ë©´ \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1392,21 +1425,21 @@ msgstr[0] ""
"현재 브랜치와 '%s'ì´(ê°€) ê°ˆë¼ì¡ŒìŠµë‹ˆë‹¤,\n"
"다른 ì»¤ë°‹ì´ ê°ê° %d개와 %dê°œ 있습니다.\n"
-#: remote.c:2114
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (ë¦¬ëª¨íŠ¸ì˜ ë¸Œëžœì¹˜ë¥¼ 현재 브랜치로 병합하려면 \"git pull\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "현재 브랜치가 ë§ê°€ì§„ 것처럼 보입니다"
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "현재 '%s' ë¸Œëžœì¹˜ì— ì•„ì§ ì•„ë¬´ ì»¤ë°‹ë„ ì—†ìŠµë‹ˆë‹¤"
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent ì˜µì…˜ì€ --bisect 옵션과 호환ë˜ì§€ 않습니다"
@@ -1456,7 +1489,7 @@ msgstr ""
"'git add <경로>' ë˜ëŠ” 'git rm <경로>'ë¡œ 표시하십시오.\n"
"그리고 ê²°ê³¼ë¬¼ì„ 'git commit'으로 커밋하십시오"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "%sì— ì“¸ 수 없습니다"
@@ -1615,12 +1648,12 @@ msgstr "\"git cherry-pick (--continue | --quit | --abort)\" ëª…ë ¹ì„ í•´ ë³´ì‹­
msgid "Could not create sequencer directory %s"
msgstr "%s 시퀀서 디렉터리를 만들 수 없습니다"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "%s ìž ê·¸ëŠ”ë° ì˜¤ë¥˜."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "빼오기(cherry-pick) ë˜ëŠ” ë˜ëŒë¦¬ê¸°(revert)ê°€ 진행 중ì´ì§€ 않습니다"
@@ -1632,63 +1665,72 @@ msgstr "HEAD를 구해 올 수 없습니다"
msgid "cannot abort from a branch yet to be born"
msgstr "새로 만들고 있는 브랜치ì—ì„œ 중지할 수 없습니다"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "%sì„(를) ì—´ 수 없습니다: %s"
+msgid "cannot open %s"
+msgstr "%sì„(를) ì—´ 수 없습니다"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "%sì„(를) ì½ì„ 수 없습니다: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "예ìƒì¹˜ 못하게 파ì¼ì´ ë났습니다"
-#: sequencer.c:888
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "빼오기 ì „ì— ì €ìž¥í•œ HEAD 파ì¼ì´('%s') ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: sequencer.c:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "%sì— í¬ë§¤íŒ…í•  수 없습니다."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: ìž˜ëª»ëœ ë¦¬ë¹„ì „"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "ìµœì´ˆì˜ ì»¤ë°‹ì„ ë˜ëŒë¦´ 수 없습니다"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "빈 헤드로 ì»¤ë°‹ì„ ë¹¼ì˜¬ 수 없습니다."
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "%sì„(를) ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "깃 저장소 버전 <= %d ë²„ì „ì„ ê¸°ëŒ€í•˜ì§€ë§Œ, %d ë²„ì „ì´ ë°œê²¬ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "ì•Œ 수 없는 저장소 í™•ìž¥ì´ ìžˆìŠµë‹ˆë‹¤:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "ì˜¤í”„ì…‹ì´ ë¬¶ìŒ íŒŒì¼ ì•žìž…ë‹ˆë‹¤ (ë§ê°€ì§„ .idx?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ì˜¤í”„ì…‹ì´ %sì˜ ë¬¶ìŒ ì¸ë±ìŠ¤ 시작보다 앞입니다 (ë§ê°€ì§„ ì¸ë±ìŠ¤?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ì˜¤í”„ì…‹ì´ %sì˜ ë¬¶ìŒ ì¸ë±ìŠ¤ ë보다 뒤입니다 (ë§ê°€ì§„ ì¸ë±ìŠ¤?)"
@@ -1715,30 +1757,39 @@ msgstr ""
"확ì¸í•´ 보시고 잘못 만들어진 것ì´ë©´ 지우십시오. ì´ ë©”ì‹œì§€ë¥¼ ë³´ê³  싶지\n"
"않으면 \"git config advice.objectNameWarning false\" ëª…ë ¹ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"병합하지 ì•Šì€ .gitmodules를 바꿀 수 없습니다. 병합 충ëŒì„ 먼저 해결하십시오"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "경로가 %sì¼ ë•Œ .gitmodulesì˜ ì„¹ì…˜ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ".gitmodules 항목 %sì„(를) ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "%sì— ëŒ€í•œ .gitmodules í•­ëª©ì„ ì œê±°í•  수 없습니다"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "ì—…ë°ì´íŠ¸í•œ .gitmodules를 커밋할 사항으로 í‘œì‹œí•˜ëŠ”ë° ì‹¤íŒ¨"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs ê°’ì— ìŒìˆ˜ë¥¼ 쓸 수 없습니다"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "%sì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1798,7 +1849,217 @@ msgstr "ìž„ì‹œ íŒŒì¼ ì´ë¦„ì„ '%s'(으)ë¡œ 바꿀 수 없습니다"
msgid "Could not read ref %s"
msgstr "%s ë ˆí¼ëŸ°ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ì²´í¬ì•„웃 ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
+"%%s브랜치를 전환하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ì²´í¬ì•„웃 ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ë³‘í•© ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
+"%%s병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ ë³‘í•© ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤."
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ %s ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
+"%%s%s ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 스태시하십시오."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"ë‹¤ìŒ íŒŒì¼ì˜ 로컬 변경 ì‚¬í•­ì„ %s ë•Œë¬¸ì— ë®ì–´ 쓰게 ë©ë‹ˆë‹¤:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"ë‹¤ìŒ ë””ë ‰í„°ë¦¬ë¥¼ ì—…ë°ì´íŠ¸í•˜ë©´ ê·¸ ì•ˆì˜ ì¶”ì í•˜ì§€ 않는 파ì¼ì„ 잃어버립니다:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s브랜치를 전환하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s병합하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s%s 하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì´ 제거ë©ë‹ˆë‹¤:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s브랜치를 전환하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"ì²´í¬ì•„웃 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s병합하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"병합 ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s%s 하기 ì „ì— ì´ íŒŒì¼ì„ 옮기거나 제거하십시오."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "'%s' í•­ëª©ì´ '%s'와(ê³¼) 겹칩니다. ë¬¶ì„ ìˆ˜ 없습니다."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"드문 ì²´í¬ì•„ì›ƒì„ ì—…ë°ì´íŠ¸í•  수 없습니다; ë‹¤ìŒ í•­ëª©ì´ ìµœì‹ ìœ¼ë¡œ ì—…ë°ì´íŠ¸ë˜ì§€ 않았습니다:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ ë®ì–´ì”니다:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"드문 ì²´í¬ì•„웃 ì—…ë°ì´íŠ¸ ë•Œë¬¸ì— ì¶”ì í•˜ì§€ 않는 ë‹¤ìŒ ìž‘ì—… í´ë” 파ì¼ì„ 제거합니다:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "중지함\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "파ì¼ì„ 가져옵니다"
@@ -1836,196 +2097,192 @@ msgstr "경로ì—ì„œ ìž˜ëª»ëœ '..' 부분"
msgid "could not open '%s' for reading and writing"
msgstr "ì½ê¸°ì™€ 쓰기용으로 '%s'ì„(를) ì—´ 수 없습니다"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s'ì„(를) ì½ê¸°ìš©ìœ¼ë¡œ ì—´ 수 없습니다"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "'%s'ì— ì ‘ê·¼í•  수 없습니다: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "'%s'ì— ì ‘ê·¼í•  수 없습니다"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "%sì„(를) 쓰기용으로 ì—´ 수 없습니다"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "%sì— ì“¸ 수 없습니다"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "%sì„(를) ë‹«ì„ ìˆ˜ 없습니다"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "병합하지 ì•Šì€ ê²½ë¡œ:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (스테ì´ì§€ 해제하려면 \"git reset %s <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (스테ì´ì§€ 해제하려면 \"git rm --cached <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git add <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (해결했다고 표시하려면 알맞게 \"git add/rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "커밋할 변경 사항:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "커밋하ë„ë¡ ì •í•˜ì§€ ì•Šì€ ë³€ê²½ 사항:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 바꾸려면 \"git add <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 바꾸려면 \"git add/rm <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (ìž‘ì—… í´ë”ì˜ ë³€ê²½ ì‚¬í•­ì„ ë²„ë¦¬ë ¤ë©´ \"git checkout -- <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­"
"시오)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (하위 ëª¨ë“ˆì˜ ì¶”ì ë˜ì§€ 않는 파ì¼ì´ë‚˜ ìˆ˜ì •ëœ ë‚´ìš©ì„ ì»¤ë°‹í•˜ê±°ë‚˜ 버리십시오)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (커밋할 ì‚¬í•­ì— í¬í•¨í•˜ë ¤ë©´ \"git %s <파ì¼>...\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "양쪽ì—ì„œ ì‚­ì œ:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "ì´ ìª½ì—ì„œ 추가:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "ì € 쪽ì—ì„œ ì‚­ì œ:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "ì € 쪽ì—ì„œ 추가:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "ì´ ìª½ì—ì„œ ì‚­ì œ:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "양쪽ì—ì„œ 추가:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "양쪽ì—ì„œ 수정:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "bug: 병합하지 ì•Šì€ ìƒíƒœ %x 처리ë˜ì§€ ì•ŠìŒ"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "새 파ì¼:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "복사함:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "삭제함:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "수정함:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "ì´ë¦„ 바꿈:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "종류 바뀜:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "ì•Œ 수 ì—†ìŒ:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "병합하지 ì•ŠìŒ:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "새 커밋, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "수정한 내용, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "추ì í•˜ì§€ ì•Šì€ ë‚´ìš©, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "버그: 처리ë˜ì§€ ì•Šì€ diff ìƒíƒœ %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "변경ë˜ì—ˆì§€ë§Œ ì—…ë°ì´íŠ¸í•˜ì§€ ì•Šì€ í•˜ìœ„ 모듈:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "커밋할 하위 ëª¨ë“ˆì˜ ë³€ê²½ 사항:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2033,39 +2290,39 @@ msgstr ""
"ìœ„ì˜ ì¤„ì„ ë°”ê¾¸ì§€ 마십시오.\n"
"아래 있는 ë‚´ìš©ì€ ëª¨ë‘ ì œê±°ë©ë‹ˆë‹¤."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "병합하지 ì•Šì€ ê²½ë¡œê°€ 있습니다."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (충ëŒì„ 바로잡고 \"git commit\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "모든 충ëŒì„ 바로잡았지만 ì•„ì§ ë³‘í•©í•˜ëŠ” 중입니다."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (ë³‘í•©ì„ ë§ˆë¬´ë¦¬í•˜ë ¤ë©´ \"git commit\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "am 세션 ì¤‘ê°„ì— ìžˆìŠµë‹ˆë‹¤."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "현재 패치가 비어 있습니다."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (충ëŒì„ ë°”ë¡œìž¡ì€ ë‹¤ìŒ \"git am --continue\"를 사용하십시오)"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (ì´ íŒ¨ì¹˜ë¥¼ 건너 뛰려면 \"git am --skip\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (ì›ë³¸ 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
@@ -2205,43 +2462,43 @@ msgstr "'ì´ë“±ë¶„하는 중입니다."
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (ì›ëž˜ 브랜치로 ëŒì•„가려면 \"git bisect reset\"ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "현재 브랜치 "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "대화형 리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "리베ì´ìŠ¤ 진행 중. ê°ˆ 위치는 "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEADê°€ ë‹¤ìŒ ìœ„ì¹˜ì—ì„œ 분리: "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEADê°€ 다ìŒìœ¼ë¡œë¶€í„° 분리: "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "현재 ì–´ë–¤ ë¸Œëžœì¹˜ë„ ì‚¬ìš©í•˜ì§€ ì•ŠìŒ."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "최초 커밋"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "추ì í•˜ì§€ 않는 파ì¼"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "무시한 파ì¼"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2252,20 +2509,20 @@ msgstr ""
"'status -uno' ì˜µì…˜ì„ ì“°ë©´ 빨ë¼ì§ˆ ìˆ˜ë„ ìžˆì§€ë§Œ, 새 파ì¼ì„\n"
"ì§ì ‘ 찾아서 추가해야 합니다. ('git help status' 참고)"
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "추ì í•˜ì§€ 않는 파ì¼ì„ 보지 않습니다%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "변경 사항 ì—†ìŒ"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
@@ -2273,12 +2530,12 @@ msgstr ""
"\"를\n"
"사용하십시오)\n"
-#: wt-status.c:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "커밋할 변경 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았습니다\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2288,55 +2545,55 @@ msgstr ""
"\"git\n"
"add\"를 사용하십시오)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "커밋할 ì‚¬í•­ì„ ì¶”ê°€í•˜ì§€ 않았지만 추ì í•˜ì§€ 않는 파ì¼ì´ 있습니다\n"
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"커밋할 사항 ì—†ìŒ (파ì¼ì„ 만들거나 복사하고 \"git add\"를 사용하면 추ì í•©ë‹ˆ"
"다)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "커밋할 사항 ì—†ìŒ\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"커밋할 사항 ì—†ìŒ (추ì í•˜ì§€ 않는 파ì¼ì„ 보려면 -u ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤)\n"
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "커밋할 사항 ì—†ìŒ, ìž‘ì—… í´ë” 깨ë—함\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "최초 커밋, 브랜치: "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (브랜치 ì—†ìŒ)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "ì—†ìŒ"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "ë‹¤ìŒ ë’¤ì—: "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "ë‹¤ìŒ ì•žì—: "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' íŒŒì¼ ì‚­ì œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -2350,7 +2607,7 @@ msgstr "git add [<옵션>] [--] <경로명세>..."
msgid "unexpected diff status %c"
msgstr "예ìƒì¹˜ 못한 diff ìƒíƒœ %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "íŒŒì¼ ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
@@ -2363,7 +2620,7 @@ msgstr "'%s' 제거\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "ì¸ë±ìŠ¤ë¥¼ 새로 고친 ë‹¤ìŒ ì»¤ë°‹ 표시하지 ì•Šì€ ë³€ê²½ 사항:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
@@ -2399,14 +2656,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "ë‹¤ìŒ ê²½ë¡œëŠ” .gitignore íŒŒì¼ ì¤‘ 하나 ë•Œë¬¸ì— ë¬´ì‹œí•©ë‹ˆë‹¤:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "가짜로 실행"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "ìžì„¸ížˆ 표시"
@@ -2414,7 +2671,7 @@ msgstr "ìžì„¸ížˆ 표시"
msgid "interactive picking"
msgstr "대화ì‹ìœ¼ë¡œ 고릅니다"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "대화ì‹ìœ¼ë¡œ ë³€ê²½ëœ ë¶€ë¶„ì„ ì„ íƒí•©ë‹ˆë‹¤"
@@ -2483,16 +2740,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "'git add .' ëª…ë ¹ì„ ì‹¤í–‰í•˜ë ¤ê³  í•œ 것 아니었습니까?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "새 ì¸ë±ìŠ¤ 파ì¼ì— 쓸 수 없습니다"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
@@ -2520,16 +2777,6 @@ msgstr "'%s'ì—ì„œ '%s'(으)ë¡œ 노트를 ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
msgid "fseek failed"
msgstr "fseek 실패"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "'%s'ì„(를) ì½ê¸°ìš©ìœ¼ë¡œ ì—´ 수 없습니다: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "'%s'ì„(를) 쓰기용으로 ì—´ 수 없습니다: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2539,74 +2786,74 @@ msgstr "'%s' 패치를 파싱할 수 없습니다"
msgid "Only one StGIT patch series can be applied at once"
msgstr "í•œë²ˆì— í•˜ë‚˜ì˜ StGIT 패치 시리즈만 ì ìš©í•  수 있습니다"
-#: builtin/am.c:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "ì‹œê°ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "Date ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "시간대 ì˜¤í”„ì…‹ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "패치 í˜•ì‹ ê²€ìƒ‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' 디렉터리 만들기가 실패했습니다"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "패치를 ìª¼ê°œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "ì´ ë¬¸ì œë¥¼ í•´ê²°í–ˆì„ ë•Œ \"%s --continue\"를 실행하십시오."
-#: builtin/am.c:1189
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "ì´ íŒ¨ì¹˜ë¥¼ 건너뛰려면, ê·¸ 대신 \"%s --skip\"ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
-#: builtin/am.c:1190
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"ì›ëž˜ 브랜치를 복구하고 패치 ì ìš©ì„ 중지하려면 \"%s --abort\"를 실행하십시오."
-#: builtin/am.c:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "패치가 비어 있습니다. 잘못 쪼개지지 않았나요?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "ìž˜ëª»ëœ ì‹ ì› ì¤„: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "%s ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "ì €ìž¥ì†Œì— 3-ë°©í–¥ 병합으로 대신할 ë•Œ 필요한 ë¸”ë¡­ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/am.c:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "ì¸ë±ìŠ¤ 정보를 사용해 기본 트리를 다시 만듭니다..."
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2614,38 +2861,38 @@ msgstr ""
"패치를 ì§ì ‘ 편집하셨습니까?\n"
"ì´ íŒ¨ì¹˜ëŠ” ì¸ë±ìŠ¤ì— 기ë¡ëœ 블롭ì—는 ì ìš©ë˜ì§€ 않습니다."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr "ë² ì´ìŠ¤ 패치 ì ìš© ë° 3-ë°©í–¥ 병합으로 대신합니다..."
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "변경 사항ì—ì„œ ë³‘í•©í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-treeê°€ 트리를 ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "빈 커밋 ë‚´ì—­ì— ëŒ€í•´ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "커밋 오브ì íŠ¸ë¥¼ ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "다시 시작할 수 없습니다: %sì´(ê°€) 없습니다."
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"터미ë„ì— í‘œì¤€ ìž…ë ¥ì´ ì—°ê²°ë˜ì§€ ì•Šì€ ìƒíƒœì—ì„œ 대화형으로 실행할 수 없습니다."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "커밋 본문ì€:"
@@ -2653,35 +2900,35 @@ msgstr "커밋 본문ì€:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "ì ìš©? 예[y]/아니오[n]/편집[e]/패치 보기[v]/ëª¨ë‘ ì ìš©[a]: "
-#: builtin/am.c:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "ë³€ê²½ëœ ì¸ë±ìŠ¤: 패치를 ì ìš©í•  수 없습니다 (dirty: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "ì ìš©í•˜ëŠ” 중: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "변경 사항 ì—†ìŒ -- 패치가 ì´ë¯¸ ì ìš©ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "패치가 %s %.*s 위치ì—ì„œ 실패했습니다"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "실패한 íŒ¨ì¹˜ì˜ ë³µì‚¬ë³¸ì´ ë‹¤ìŒ ìœ„ì¹˜ì— ìžˆìŠµë‹ˆë‹¤: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2691,7 +2938,7 @@ msgstr ""
"커밋으로 표시할 ì‚¬í•­ì´ ë‚¨ì•„ 있지 않으면, ì´ë¯¸ ê°™ì€ íŒ¨ì¹˜ì—ì„œ ì ìš©ëœ\n"
"ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 그런 경우ì—는 ì´ íŒ¨ì¹˜ë¥¼ 건너뛰면 ë©ë‹ˆë‹¤."
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2699,17 +2946,17 @@ msgstr ""
"ì¸ë±ìŠ¤ì— 병합하지 ì•Šì€ ê²½ë¡œê°€ 남아 있습니다.\n"
"'git add' ì‚¬ìš©ì„ ìžŠì§€ 않으셨습니까?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' 오브ì íŠ¸ë¥¼ 파싱할 수 없습니다."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "ì¸ë±ìŠ¤ ì§€ìš°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2717,155 +2964,157 @@ msgstr ""
"마지막 'am' 실패 ì´í›„ HEAD를 옮긴 것 같습니다.\n"
"ORIG_HEADë¡œ ë˜ëŒë¦¬ì§€ 않습니다."
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "--patch-format ì˜µì…˜ì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<옵션>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<옵션>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "대화형으로 실행합니다"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "아무 ë™ìž‘ë„ í•˜ì§€ 않습니다 (과거부터 ìžˆì—ˆë˜ ì˜µì…˜)"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "필요하면 3-ë°©í–¥ 병합으로 대신하ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "간략히 표시합니다"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "커밋 ë©”ì‹œì§€ì— Signed-off-by ì¤„ì„ ë‚¨ê¹ë‹ˆë‹¤"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "UTF-8 ì¸ì½”딩으로 변환합니다 (기본값)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "git-mailinfoì— -k ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "git-mailinfoì— -b ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "git-mailinfoì— -m ì˜µì…˜ì„ ì”니다"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "mbox 형ì‹ì— 대해 git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/am.c:2267
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"am.keepcrì— ë¬´ê´€í•˜ê²Œ git-mailsplitì— --keep-cr ì˜µì…˜ì„ ì‚¬ìš©í•˜ì§€ 않습니다."
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "절취선 ì•žì˜ ëª¨ë“  ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "ë™ìž‘"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "git-applyì— ë„˜ê¹ë‹ˆë‹¤"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "최ìƒìœ„"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "경로"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "개수"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "형ì‹"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "íŒ¨ì¹˜ì˜ í˜•ì‹"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "패치 실패가 ë°œìƒí–ˆì„ ë•Œ 오류 메시지 대신 사용합니다"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "충ëŒì„ í•´ê²°í•œ ë‹¤ìŒ íŒ¨ì¹˜ ì ìš©ì„ 계ì†í•©ë‹ˆë‹¤"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "--continue 옵션과 ë™ì¼"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "현재 패치 건너뛰기"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr "ì›ëž˜ 브랜치를 복구하고 패치 ì ìš© ìž‘ì—…ì„ ì¤‘ì§€í•©ë‹ˆë‹¤."
# NOTE: ì˜µì…˜ì˜ ì˜ë¯¸ëŠ” ì´ê²Œ 맞다. ì›ë¬¸ì—서는 사용ìžê°€
# --committer-date-is-author-dateë¼ëŠ” ì˜µì…˜ì„ ë³´ê³  ì˜ë¯¸ë¥¼ ì•Œ 수 있다고 가정하고 있다.
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "커미터 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 넣습니다"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "현재 ì‹œê°ì„ ìž‘ì„±ìž ì‹œê°ìœ¼ë¡œ 사용합니다"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "키-ID"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "GPG 서명 커밋"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(git-rebase를 위한 내부 ìš©ë„)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2873,16 +3122,16 @@ msgstr ""
"-b/--binary ì˜µì…˜ì€ ì˜¤ëžœ 시간 ë™ì•ˆ 아무 ë™ìž‘ë„ í•˜ì§€ 않았으므로, ì´\n"
"ì˜µì…˜ì€ ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. ì´ì œ 사용하지 마십시오."
-#: builtin/am.c:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "ì¸ë±ìŠ¤ ì½ê¸°ì— 실패했습니다"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "ì´ì „ 리베ì´ìŠ¤ 디렉터리 %sì´(ê°€) ì•„ì§ ìžˆê³  mbox를 지정했습니다."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2891,7 +3140,7 @@ msgstr ""
"ë²—ì–´ë‚œ %s 디렉터리가 발견ë˜ì—ˆìŠµë‹ˆë‹¤.\n"
"제거하려면 \"git am --abort\"를 사용하십시오."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "해소 ìž‘ì—…ì´ ì§„í–‰ 중입니다. 다시 시작하지 않습니다."
@@ -2924,41 +3173,41 @@ msgstr "regexec()ì—ì„œ ë‹¤ìŒ ìž…ë ¥ì— ëŒ€í•´ %dë²ˆì„ ë¦¬í„´í–ˆìŠµë‹ˆë‹¤: %s"
msgid "unable to find filename in patch at line %d"
msgstr "íŒ¨ì¹˜ì˜ %d번 ì¤„ì— íŒŒì¼ ì´ë¦„ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %2$d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆì§€ë§Œ, '%1$s'ì´"
"(가) 왔습니다"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ìƒˆ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: ìž˜ëª»ëœ git-diff - %d번 ì¤„ì— ì˜ˆì „ íŒŒì¼ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: ìž˜ëª»ëœ git-diff - %d번 줄ì—ì„œ /dev/nullì„ ê¸°ëŒ€í–ˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: 예ìƒì¹˜ 못한 줄: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "%d번 ì¤„ì— í—¤ë” ì—†ëŠ” 패치 부분: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2970,76 +3219,76 @@ msgstr[0] ""
"경로 ì´ë¦„ 부분ì—ì„œ %d개를 ì œê±°ë¼ ë•Œ git diff í—¤ë”ì— íŒŒì¼ ì´ë¦„ ì •ë³´ê°€ 없습니"
"다. (%d번 줄)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "새 파ì¼ì´ 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "삭제한 파ì¼ì— ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "패치가 %d번 줄ì—ì„œ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "새 íŒŒì¼ %sì´(ê°€) 예전 ë‚´ìš©ì— ì˜ì¡´í•©ë‹ˆë‹¤"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "삭제한 íŒŒì¼ %sì´(ê°€) ì•„ì§ ë‚´ìš©ì´ ë“¤ì–´ 있습니다"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 경고: %s 파ì¼ì˜ ë‚´ìš©ì´ ë¹„ì–´ 있지만 ì‚­ì œë˜ì§€ 않았습니다"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "%d번 ì¤„ì— ë°”ì´ë„ˆë¦¬ 패치가 ì´í•´í•  수 없습니다"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "%d번 ì¤„ì— ì“°ë ˆê¸° ë°ì´í„°ë§Œ 있는 패치"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "%s 심볼릭 ë§í¬ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "%sì„(를) 열거나 ì½ì„ 수 없습니다"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "줄 ì‹œìž‘ì´ ìž˜ëª»ë¨: '%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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줄)"
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "컨í…스트가 (%ld/%ld)ë¡œ 줄어듭니다. (%d번 줄ì—ì„œ ì ìš©)"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3048,319 +3297,329 @@ msgstr ""
"다ìŒì„ ê²€ìƒ‰í•˜ë˜ ì¤‘:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치 ë°ì´í„°ê°€ 없습니다"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "ë°”ì´ë„ˆë¦¬ 패치를 '%s'ì— ì ìš©í•  수 없습니다"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s'ì— ëŒ€í•œ ë°”ì´ë„ˆë¦¬ 패치가 올바르지 ì•Šì€ ê²°ê³¼ë¥¼ 만듭니다. (기대한 ê°’ %s, 실"
"제 %s)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "패치 실패: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "%sì„(를) 가져올 수 없습니다"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "%s ì½ê¸°ê°€ 실패했습니다"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "심볼릭 ë§í¬ ë’¤ì— ìžˆëŠ” '%s' ì½ê¸°"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s 경로가 ì´ë¦„ì´ ë°”ë€Œì—ˆê±°ë‚˜ ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: ì¸ë±ìŠ¤ì— 없습니다"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s: ì¸ë±ìŠ¤ì™€ 맞지 않습니다"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "제거하는 패치 다ìŒì— íŒŒì¼ ë‚´ìš©ì´ ë‚¨ì•˜ìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: ìž˜ëª»ëœ ì¢…ë¥˜"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%sì˜ ì¢…ë¥˜ê°€ %oì´ì§€ë§Œ %oì´(ê°€) ë˜ì–´ì•¼ 합니다"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "ìž˜ëª»ëœ ê²½ë¡œ '%s'"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ì´ë¯¸ ìž‘ì—… ë””ë ‰í„°ë¦¬ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$sì˜ ìƒˆ 모드(%1$o)ê°€ 예전 모드(%3$o)와 다릅니다"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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)와 다릅니다"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "ì˜í–¥ 받는 '%s' 파ì¼ì´ 심볼릭 ë§í¬ ë’¤ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: 패치를 ì ìš©í•˜ì§€ 않습니다"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "%s 패치를 확ì¸í•˜ëŠ” 중입니다..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "경로 '%s'ì— ëŒ€í•´ make_cache_entry 실패"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "ì¸ë±ìŠ¤ì—ì„œ %sì„(를) 제거할 수 없습니다"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "하위 모듈 %sì— ëŒ€í•´ ì†ìƒëœ 패치"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ stat()í•  수 없습니다"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "새로 만든 íŒŒì¼ '%s'ì— ëŒ€í•´ 예비 저장소를 만들 수 없습니다"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%sì— ëŒ€í•´ ìºì‹œ í•­ëª©ì„ ì¶”ê°€í•  수 없습니다"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "'%s' 파ì¼ì„ 닫는 중입니다"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' 파ì¼ì— 쓸 수 없습니다 ('%o' 모드)"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s 패치 ê¹”ë”하게 ì ìš©."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "내부 오류"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s 패치를 (%dê°œ 거부) ì ìš©..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncating .rej íŒŒì¼ ì´ë¦„ì„ '%.*s.rej'(으)ë¡œ ìžë¦„"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "%sì„(를) ì—´ 수 없습니다: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "패치 부위 #%d ê¹”ë”하게 ì ìš©."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "패치 부위 #%d 거부ë¨."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "패치 '%s' 건너뜀."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "ì¸ì‹í•  수 없는 ìž…ë ¥"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•˜ì§€ 않습니다"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "주어진 ê²½ë¡œì— í•´ë‹¹í•˜ëŠ” 변경 ì‚¬í•­ì„ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "전통ì ì¸ diff 경로 ì•žì˜ <개수>ê°œì˜ ì•ž 슬래시(/)를 제거합니다"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "패치ì—ì„œ 추가하는 파ì¼ì„ 무시합니다"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ diffstatì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "십진수로 추가 ë° ì‚­ì œí•œ 줄 수를 표시합니다"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, ìž…ë ¥ì— ëŒ€í•œ ìš”ì•½ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "패치를 ì ìš©í•˜ëŠ” 대신, 패치를 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "현재 ì¸ë±ìŠ¤ì—ì„œ 패치가 ì ìš© 가능한지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "ìž‘ì—… í´ë”를 바꾸지 ì•Šê³  패치를 ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "ìž‘ì—… ì˜ì—­ ë°–ì˜ íŒŒì¼ì„ 바꾸는 패치를 허용합니다"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "그리고 íŒ¨ì¹˜ë„ ì ìš©í•©ë‹ˆë‹¤ (--stat/--summary/--check 옵션과 ê°™ì´ ì‚¬ìš©)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "패치를 ì ìš©í•˜ì§€ 않으면 3-ë°©í–¥ ë³‘í•©ì„ ì‹œë„합니다"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr "내장 ì¸ë±ìŠ¤ 정보를 사용해 ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만듭니다"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "경로를 NUL 문ìžë¡œ 구분합니다"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "최소한 <n>ì¤„ì´ ì»¨í…스트와 ì¼ì¹˜í•˜ëŠ”지 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "공백 오류가 있는 추가ë거나 ìˆ˜ì •ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "컨í…스트를 ì°¾ì„ ë•Œ 공백 변경 ì‚¬í•­ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "패치를 반대 순서로 ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "ìµœì†Œí•œì˜ ì»¨í…스트 í•œ ì¤„ë„ ì—†ì´ ì ìš©í•©ë‹ˆë‹¤"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "ê±°ë¶€ëœ íŒ¨ì¹˜ ë¶€ë¶„ì„ ëŒ€ì‘ë˜ëŠ” *.rej 파ì¼ì— 남겨둡니다"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "패치 ë¶€ë¶„ì´ ê²¹ì³ë„ 허용합니다"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "íŒŒì¼ ëì— ì¤„ë°”ê¿ˆì´ ë¹ ì¡ŒìŒì„ 잘못 검색한 ê²½ìš°ì— ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "패치 ë¶€ë¶„ì˜ í—¤ë”ì˜ ì¤„ 수를 신용하지 않습니다"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "모든 íŒŒì¼ ì´ë¦„ì— <최ìƒìœ„>를 ì•žì— ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "저장소 ë°–ì—ì„œ --3way 옵션 사용"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "저장소 ë°–ì—ì„œ --index 옵션 사용"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "저장소 ë°–ì—ì„œ --cached 옵션 사용"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "'%s' 패치를 열 수 없습니다"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "공백 오류 %d개를 넘어갑니다"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3425,99 +3684,99 @@ msgstr "<리비전-옵션>ì€ git-rev-list(1)ì— ì„¤ëª…ë˜ì–´ 있습니다"
msgid "Blaming lines"
msgstr "블레임 줄"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "블레임 í•­ëª©ì„ ì°¾ìžë§ˆìž ì ì§„ì ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "가장ìžë¦¬ ì»¤ë°‹ì— ëŒ€í•´ 빈 SHA-1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "최ìƒìœ„ ì»¤ë°‹ì„ ê°€ìž¥ìžë¦¬ 커밋으로 취급하지 않습니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "작업 비용 통계를 표시합니다"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "강제로 진행 ìƒí™©ì„ 표시합니다"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "블레임 í•­ëª©ì— ëŒ€í•´ 출력 ì ìˆ˜ë¥¼ 표시합니다"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "ì›ëž˜ íŒŒì¼ ì´ë¦„ 표시 (기본값: ìžë™)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "ì›ëž˜ 줄 번호 표시 (기본값: 하지 ì•ŠìŒ)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "컴퓨터 처리용으로 ì„¤ê³„ëœ í˜•ì‹ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "줄마다 커밋 ì •ë³´ê°€ 표시ë˜ëŠ” 사용ìžìš© 형ì‹ìœ¼ë¡œ 표시합니다"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "git-annotate와 ë™ì¼í•œ 형ì‹ì„ 사용합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "내부 형ì‹ìœ¼ë¡œ ì‹œê°ì„ 표시합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "길게 커밋 SHA1ì„ í‘œì‹œí•©ë‹ˆë‹¤ (기본값: 꺼ì§)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "ìž‘ì„±ìž ì´ë¦„ê³¼ ì‹œê°ì„ 표시하지 않습니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr "ìž‘ì„±ìž ì´ë¦„ ëŒ€ì‹ ì— ì „ìžë©”ì¼ì„ 표시합니다 (기본값: 꺼ì§)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "공백 ë¬¸ìž ì°¨ì´ì ì„ 무시합니다"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "ë” ì¼ì¹˜í•˜ëŠ” í•­ëª©ì„ ì°¾ëŠ”ë° ë” ì‹œê°„ì„ ì†Œëª¨í•©ë‹ˆë‹¤"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "git-rev-list를 호출하는 대신 <파ì¼>ì—ì„œ ë¦¬ë¹„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "<파ì¼>ì˜ ë‚´ìš©ì„ ìµœì¢… ì´ë¯¸ì§€ë¡œ 사용합니다"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "ì ìˆ˜"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ ë³µì‚¬ëœ ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "íŒŒì¼ ë‚´ë¶€ì™€ íŒŒì¼ ì‚¬ì´ì˜ 옮겨진 ì¤„ì„ ì°¾ìŠµë‹ˆë‹¤"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "n,m줄 (1번 줄부터 시작) 사ì´ì˜ 범위만 처리"
@@ -3527,31 +3786,31 @@ msgstr "n,m줄 (1번 줄부터 시작) 사ì´ì˜ 범위만 처리"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "4년 11달 전"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<옵션>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<옵션>] [-l] [-f] <브랜치-ì´ë¦„> [<시작-지ì >]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<옵션>] [-r] (-d | -D) <브랜치-ì´ë¦„>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3560,7 +3819,7 @@ msgstr ""
"'%s' 브랜치를 삭제합니다. ì´ ë¸Œëžœì¹˜ëŠ” '%s'ì—\n"
" 병합ë˜ì—ˆì§€ë§Œ, HEADì—는 병합ë˜ì§€ 않았습니다."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3569,12 +3828,12 @@ msgstr ""
"'%s' 브랜치를 삭제하지 않습니다. ì´ ë¸Œëžœì¹˜ëŠ” '%s'ì—\n"
" 병합ë˜ì§€ 않았지만, HEADì—는 병합ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 커밋 오브ì íŠ¸ë¥¼ 찾아볼 수 없습니다"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3583,299 +3842,320 @@ msgstr ""
"'%s' 브랜치가 완전히 병합ë˜ì§€ 않았습니다.\n"
"ì •ë§ë¡œ 삭제하려면 'git branch -D %s' ëª…ë ¹ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "config-file ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "-a ì˜µì…˜ì„ -d 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "HEADì— ëŒ€í•œ 커밋 오브ì íŠ¸ë¥¼ 찾아볼 수 없습니다"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "'%s' 브랜치는 현재 위치한 브랜치ì´ê¸° ë•Œë¬¸ì— ì‚­ì œí•  수 없습니다."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "'%2$s' ìœ„ì¹˜ì— ì²´í¬ì•„웃한 '%1$s' 브랜치를 삭제할 수 없습니다"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "리모트 ì¶”ì  '%s' 브랜치가 없습니다."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "'%s' 브랜치가 없습니다."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "리모트 ì¶”ì  '%s' 브랜치를 ì‚­ì œí•˜ëŠ”ë° ì˜¤ë¥˜"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "'%s' 브랜치를 ì‚­ì œí•˜ëŠ”ë° ì˜¤ë¥˜"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "리모트 ì¶”ì  '%s' 브랜치를 삭제합니다. (과거 %s)\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s 브랜치 삭제 (과거 %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 사ë¼ì§]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: %d개 뒤]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[%d개 뒤]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: %d개 앞]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[%d개 앞]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: %d개 앞, %d개 뒤]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[%d개 앞, %d개 뒤]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤ ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(브랜치 ì—†ìŒ, %s 리베ì´ìŠ¤)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(브랜치 ì—†ìŒ, ì´ë“±ë¶„ %sì—ì„œ 시작)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD %s 위치ì—ì„œ 분리ë¨)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD %s(으)로부터 분리ë¨)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(브랜치 ì—†ìŒ)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "%s 브랜치를 %s ìœ„ì¹˜ì— ë¦¬ë² ì´ìŠ¤í•©ë‹ˆë‹¤"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "%s 브랜치를 %s 위치ì—ì„œ bisect합니다"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr "브랜치 ìœ„ì— ì—†ìœ¼ë©´ì„œ 현재 브랜치 ì´ë¦„ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "ìž˜ëª»ëœ ë¸Œëžœì¹˜ ì´ë¦„: '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "브랜치 ì´ë¦„ 바꾸기 실패"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "ì´ë¦„ì´ ìž˜ëª»ëœ '%s' ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë‹¤ë¥´ê²Œ 바꿉니다"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "브랜치 ì´ë¦„ì„ %s(으)ë¡œ 바꾸지만, HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "ë¸Œëžœì¹˜ì˜ ì´ë¦„ì„ ë°”ê¾¸ì§€ë§Œ, config-file ì—…ë°ì´íŠ¸ê°€ 실패했습니다"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "브랜치 설명 ì„œì‹ì„ 쓸 수 없습니다: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "브랜치 설명 ì„œì‹ì„ 쓸 수 없습니다"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "ì¼ë°˜ 옵션"
# FIXME: give twice?
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "해시와 ì œëª©ì„ í‘œì‹œí•˜ê³ , 업스트림 ë¸Œëžœì¹˜ì— ëŒ€í•œ 위치를 표시합니다"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "여러가지 안내 메시지를 표시하지 않습니다"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "ì¶”ì  ëª¨ë“œë¥¼ 설정합니다 (git-pull(1) 참고)"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "업스트림 정보를 바꿉니다"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "업스트림"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "업스트림 정보를 바꿉니다"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "여러 색으로 출력합니다"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "리모트 ì¶”ì  ë¸Œëžœì¹˜ì— ëŒ€í•´ ë™ìž‘합니다"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "ì»¤ë°‹ì´ ìžˆëŠ” 브랜치만 표시합니다"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "특정 git-branch ë™ìž‘:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "리모트와 ë¡œì»¬ì˜ ë¸Œëžœì¹˜ 목ë¡ì„ ëª¨ë‘ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "완전히 ë³‘í•©ëœ ë¸Œëžœì¹˜ë¥¼ 삭제합니다"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "브랜치를 삭제합니다 (병합ë˜ì§€ 않았ë”ë¼ë„)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "브랜치와 ê·¸ reflog를 옮기거나 ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "대ìƒì´ ì´ë¯¸ 있ë”ë¼ë„ 브랜치를 옮기거나 ì´ë¦„ì„ ë°”ê¿‰ë‹ˆë‹¤"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "브랜치 ì´ë¦„ 목ë¡ì„ 표시합니다"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "ë¸Œëžœì¹˜ì˜ reflog를 만듭니다"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "ë¸Œëžœì¹˜ì˜ ì„¤ëª…ì„ íŽ¸ì§‘í•©ë‹ˆë‹¤"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "강제로 만들고, 옮기거나 ì´ë¦„ì„ ë°”ê¾¸ê³ , 삭제합니다"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "병합ë˜ëŠ” 브랜치만 표시합니다"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "병합ë˜ì§€ 않는 브랜치만 표시합니다"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "키"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "정렬한 ê¸°ì¤€ì´ ë˜ëŠ” í•„ë“œ ì´ë¦„"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "오브ì íŠ¸"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "해당 오브ì íŠ¸ì˜ 브랜치만 표시합니다"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "HEAD를 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ êµ¬í•´ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "ë ˆí¼ëŸ°ìŠ¤/헤드 ì•„ëž˜ì— HEADê°€ 없습니다!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column ë° --verbose ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "브랜치 ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "ë¶„ë¦¬ëœ HEADì— ëŒ€í•œ ì„¤ëª…ì„ ë¶€ì—¬í•  수 없습니다"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "여러 ë¸Œëžœì¹˜ì— ëŒ€í•œ ì„¤ëª…ì„ íŽ¸ì§‘í•  수 없습니다"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "ì•„ì§ '%s' ë¸Œëžœì¹˜ì— ì»¤ë°‹ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "ì´ë¦„ì´ '%s'ì¸ ë¸Œëžœì¹˜ê°€ 없습니다."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "ì´ë¦„ 바꾸기 ìž‘ì—…ì— ëŒ€í•´ 브랜치가 너무 많습니다"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "새 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì„¤ì •í•˜ëŠ”ë° ë¸Œëžœì¹˜ê°€ 너무 많습니다"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3883,41 +4163,41 @@ msgstr ""
"HEADì˜ ì—…ìŠ¤íŠ¸ë¦¼ì„ %s(으)ë¡œ 설정할 수 없습니다. ì–´ë–¤ ë¸Œëžœì¹˜ë„ ê°€ë¦¬í‚¤ì§€ 않습니"
"다."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "그런 브랜치가 ('%s') 없습니다"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' 브랜치가 없습니다"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "업스트림 ì„¤ì •ì„ í•´ì œí•˜ëŠ”ë° ë¸Œëžœì¹˜ê°€ 너무 많습니다"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEADì˜ ì—…ìŠ¤íŠ¸ë¦¼ ì„¤ì •ì„ í•´ì œí•  수 없습니다. ì–´ë–¤ ë¸Œëžœì¹˜ë„ ê°€ë¦¬í‚¤ì§€ 않습니다."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' ë¸Œëžœì¹˜ì— ì—…ìŠ¤íŠ¸ë¦¼ ì •ë³´ê°€ 없습니다"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "'HEAD'를 수ë™ìœ¼ë¡œ 만드는 ê±´ 앞뒤가 맞지 않습니다"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"'git branch'ì— ëŒ€í•´ -a ë° -r ì˜µì…˜ì€ ë¸Œëžœì¹˜ ì´ë¦„ê³¼ ê°™ì´ ì“°ë©´ 앞뒤가 맞지 않습"
"니다"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3926,7 +4206,7 @@ msgstr ""
"--set-upstream ì˜µì…˜ì€ ë” ì´ìƒ 사용ë˜ì§€ ì•Šê³  ì œê±°ë  ì˜ˆì •ìž…ë‹ˆë‹¤. --track ë˜ëŠ” "
"--set-upstream-to ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3936,16 +4216,6 @@ msgstr ""
"\n"
"'%s'ì„(를) 만들고 '%s'ì„(를) 추ì í•˜ê²Œ 하려면, 다ìŒì„ 하십시오:\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4044,7 +4314,7 @@ msgstr "표준 ìž…ë ¥ì—ì„œ íŒŒì¼ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
msgid "terminate input and output records by a NUL character"
msgstr "NUL 문ìžë¥¼ 기준으로 ìžë£Œ ìž…ë ¥ ë° ì¶œë ¥ì„ ë©ˆì¶¥ë‹ˆë‹¤"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "진행 ìƒí™© 표시를 하지 않습니다"
@@ -4134,8 +4404,9 @@ msgid "write the content to temporary files"
msgstr "ë‚´ìš©ì„ ìž„ì‹œ 파ì¼ì— ì”니다"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "문ìžì—´"
@@ -4185,79 +4456,79 @@ msgstr "'%s' 경로: 병합할 수 없습니다"
msgid "Unable to add merge result for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 병합 결과를 추가할 수 없습니다"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ì˜µì…˜ì€ ì—…ë°ì´íŠ¸í•˜ëŠ” 경로ì—ì„œ 쓸 수 없습니다"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ì˜µì…˜ì€ %s 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환하는 ì¼ì€ ë™ì‹œì— í•  수 없습니다."
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "ì†ìƒëœ ì¸ë±ìŠ¤ 파ì¼"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' 경로를 병합하지 않았습니다"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "현재 ì¸ë±ìŠ¤ë¥¼ 먼저 해결해야 합니다"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s'ì— ëŒ€í•´ reflogí•  수 없습니다: %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEADì˜ í˜„ìž¬ 위치는"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "HEAD를 ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' 브랜치 리셋\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "ì´ë¯¸ '%s'ì— ìžˆìŠµë‹ˆë‹¤\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 그리고 %dê°œ ë”.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4275,7 +4546,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4296,151 +4567,151 @@ msgstr[0] ""
" git branch <새-브랜치-ì´ë¦„> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "리비전 walkì— ë‚´ë¶€ 오류"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "ì´ì „ HEAD 위치는"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "현재 위치가 만들 ì˜ˆì •ì¸ ë¸Œëžœì¹˜ì— ìžˆìŠµë‹ˆë‹¤"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "í•˜ë‚˜ì˜ ë ˆí¼ëŸ°ìŠ¤ë§Œ 지정해야 하지만 %d개를 지정했습니다."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "ìž˜ëª»ëœ ë ˆí¼ëŸ°ìŠ¤: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "ë ˆí¼ëŸ°ìŠ¤ê°€ 트리가 아닙니다: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "브랜치를 ì „í™˜í•˜ëŠ”ë° ê²½ë¡œë¥¼ 사용할 수 없습니다"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ì˜µì…˜ì€ ë¸Œëžœì¹˜ë¥¼ 전환할 ë•Œ 쓸 수 없습니다"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ì˜µì…˜ì€ '%s' 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "브랜치를 ì»¤ë°‹ì´ ì•„ë‹Œ '%s'(으)ë¡œ 전환할 수 없습니다"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "브랜치"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "새 브랜치를 만들고 가져옵니다"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ reflog를 만듭니다"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "지정한 커밋ì—ì„œ HEAD를 분리합니다"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•œ 업스트림 정보를 설정합니다"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "새-브랜치"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "ìƒìœ„ 브랜치가 없는 새 브랜치"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 우리쪽 ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "병합ë˜ì§€ ì•Šì€ íŒŒì¼ì— 대해 ìƒëŒ€íŽ¸ ë²„ì „ì„ ê°€ì ¸ì˜µë‹ˆë‹¤"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "강제로 ì²´í¬ì•„웃합니다 (로컬ì—ì„œ 수정한 ì‚¬í•­ì„ ë²„ë¦½ë‹ˆë‹¤)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "새 ë¸Œëžœì¹˜ì— ëŒ€í•´ 3-ë°©í–¥ ë³‘í•©ì„ ìˆ˜í–‰í•©ë‹ˆë‹¤"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "무시하는 파ì¼ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "스타ì¼"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "ì¶©ëŒ ìŠ¤íƒ€ì¼ (merge ë˜ëŠ” diff3)"
# FIXME: ì˜ë¯¸ 불명
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "경로명세를 드문 항목ì—만 제한하지 않습니다"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "'git checkout <없는-브랜치>'ì— ëŒ€í•´ 추측합니다"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr "다른 ìž‘ì—…í´ë”ì— ì£¼ì–´ì§„ ë ˆí¼ëŸ°ìŠ¤ê°€ 있는지 확ì¸í•˜ì§€ 않습니다"
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "강제로 진행 ìƒí™©ì„ 표시합니다"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B ë° --orphan ì˜µì…˜ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track ì˜µì…˜ì€ ë¸Œëžœì¹˜ ì´ë¦„ì´ í•„ìš”í•©ë‹ˆë‹¤"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "브랜치 ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤. -b ì˜µì…˜ì„ ì‚¬ìš©í•´ 보십시오"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "경로 명세가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4449,12 +4720,12 @@ msgstr ""
"ë™ì‹œì— 경로를 ì—…ë°ì´íŠ¸í•˜ê³  '%s' 브랜치로 전환할 수 없습니다.\n"
"ì»¤ë°‹ì„ í™•ì¸í•  수 없는 '%s'ì„(를) 가져오려고 하셨습니까?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach ì˜µì…˜ì€ ê²½ë¡œ ì¸ìžë¥¼ 받지 않습니다 '%s'"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4605,8 +4876,8 @@ msgstr "대화형 지우기"
msgid "remove whole directories"
msgstr "전체 디렉터리 제거"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "패턴"
@@ -4646,103 +4917,112 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "ì²´í¬ì•„ì›ƒì„ ë§Œë“¤ì§€ 않습니다"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "간략한 저장소를 만듭니다"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "로컬 저장소ì—ì„œ 복제합니다"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "로컬 하드ë§í¬ë¥¼ 사용하지 ì•Šê³ , í•­ìƒ ë³µì‚¬í•©ë‹ˆë‹¤"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "공유 저장소로 설정합니다"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "복제한 결과물ì—ì„œ 하위 ëª¨ë“ˆì„ ì´ˆê¸°í™”í•©ë‹ˆë‹¤"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "병렬ì ìœ¼ë¡œ 복제하는 하위모듈 개수"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "ì„œì‹-디렉터리"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "ì„œì‹ì„ 사용할 디렉터리 위치"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "ë ˆí¼ëŸ°ìŠ¤ 저장소"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "복제할 경우ì—만 --reference를 사용합니다"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "ì´ë¦„"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "업스트림 추ì ì— 'origin' 대신 <ì´ë¦„>ì„ ì‚¬ìš©í•©ë‹ˆë‹¤"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "ë¦¬ëª¨íŠ¸ì˜ HEAD 대신 <브랜치>를 가져옵니다"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "ë¦¬ëª¨íŠ¸ì˜ git-upload-pack 경로"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "깊ì´"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "지정한 깊ì´ì˜ ì–•ì€ ë³µì œë¥¼ 만듭니다"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "í•˜ë‚˜ì˜ ë¸Œëžœì¹˜ë§Œ 복제합니다 (HEAD ë˜ëŠ” --branchë¡œ 지정)"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "모든 복제한 하위 ëª¨ë“ˆì€ ì–•ì€ ëª¨ë“ˆìž…ë‹ˆë‹¤"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "깃 디렉터리를 ìž‘ì—… í´ë”와 ë³„ê°œì˜ ìœ„ì¹˜ì— ë†“ìŠµë‹ˆë‹¤"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "키=값"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "새 저장소 안ì—ì„œ 설정합니다"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "IPv4 주소만 사용합니다"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "IPv6 주소만 사용합니다"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4750,58 +5030,53 @@ msgstr ""
"디렉터리 ì´ë¦„ì„ ì•Œì•„ë‚¼ 수 없습니다.\n"
"명령행ì—ì„œ 디렉터리를 지정하십시오"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소를 ì—°ê²°ëœ ì²´í¬ì•„웃으로 쓰기는 ì•„ì§ ì§€ì›í•˜ì§€ 않습니다."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 로컬 저장소가 아닙니다."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 ì–•ì€ ì €ìž¥ì†Œìž…ë‹ˆë‹¤"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ë ˆí¼ëŸ°ìŠ¤ '%s' 저장소가 붙어 있는 저장소입니다"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "'%s'ì´(ê°€) 있지만 디렉터리가 아닙니다"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "'%s'ì— ëŒ€í•´ stat()ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' ë§í¬ë¥¼ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "파ì¼ì„ '%s'(으)ë¡œ ë³µì‚¬í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "완료.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4811,127 +5086,127 @@ msgstr ""
"'git status' 명령으로 ë¬´ì—‡ì„ ì²´í¬ì•„웃했는지 살펴볼 수 있고\n"
"'git checkout -f HEAD'ë¡œ ì²´í¬ì•„ì›ƒì„ ë‹¤ì‹œ í•  수 있습니다\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "복제할 ë¦¬ëª¨íŠ¸ì˜ %s 브랜치를 ì°¾ì„ ìˆ˜ 없습니다."
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다..."
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "리모트ì—ì„œ 필요한 오브ì íŠ¸ë¥¼ ëª¨ë‘ ë³´ë‚´ì§€ 않았습니다"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "%sì„(를) ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "리모트 HEADê°€ 없는 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 참고하므로, ì²´í¬ì•„웃할 수 없습니다.\n"
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "ìž‘ì—… í´ë”를 ì²´í¬ì•„웃할 수 없습니다"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "파ë¼ë¯¸í„°ë¥¼ 설정 파ì¼ì— 쓸 수 없습니다"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "정리용으로 repack할 수 없습니다"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "ë³´ì¡° ìž„ì‹œ 파ì¼ì„ 삭제할 수 없습니다"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "너무 ì¸ìžê°€ 많습니다."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "복제할 저장소를 지정해야 합니다."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare ë° --origin %s ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ë° --separate-git-dir ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' 저장소가 없습니다"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "깊ì´ê°€(%s) 0보다 í° ìˆ˜ê°€ 아닙니다"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "ëŒ€ìƒ ê²½ë¡œê°€('%s') ì´ë¯¸ 있고 빈 디렉터리가 아닙니다."
-#: builtin/clone.c:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "ìž‘ì—… í´ë”ê°€('%s') ì´ë¯¸ 있습니다."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "'%s'ì˜ ì•ž 디렉터리를 만들 수 없습니다"
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "간략한 저장소로('%s') 복제합니다...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "'%s'ì— ë³µì œí•©ë‹ˆë‹¤...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth ì˜µì…˜ì€ ë¡œì»¬ 복제ì—ì„œ 무시ë©ë‹ˆë‹¤. ëŒ€ì‹ ì— 'file://'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "ì›ë³¸ 저장소가 ì–•ì€ ì €ìž¥ì†Œì´ë¯€ë¡œ, --local ì˜µì…˜ì„ ë¬´ì‹œí•©ë‹ˆë‹¤"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local ì˜µì…˜ì€ ë¬´ì‹œë©ë‹ˆë‹¤"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "%sì˜ ë³µì œ ë°©ë²•ì„ ì•Œì§€ 못합니다"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ë¦¬ëª¨íŠ¸ì˜ %s 브랜치가 업스트림 %sì— ì—†ìŠµë‹ˆë‹¤"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "빈 저장소를 복제한 것처럼 보입니다."
@@ -5071,66 +5346,66 @@ msgstr ""
"ê·¸ 다ìŒì— \"git cherry-pick --continue\"를 하면 나머지 커밋ì—\n"
"대해 커밋 빼오기를 다시 시작합니다.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "HEAD 트리 오브ì íŠ¸ì˜ 묶ìŒì„ í‘¸ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ 만들 수 없습니다"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "대화형 추가가 실패했습니다"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ë¥¼ ì—…ë°ì´íŠ¸í•  수 없습니다"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "주요 ìºì‹œ 트리를 ì—…ë°ì´íŠ¸í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "new_index 파ì¼ì— 쓸 수 없습니다"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "병합하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "커밋 빼오기를 하는 중 부분 ì»¤ë°‹ì„ í•  수 없습니다."
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "ìž„ì‹œ ì¸ë±ìŠ¤ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' ì»¤ë°‹ì— ìž‘ì„±ìž í—¤ë”ê°€ 없습니다"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' ì»¤ë°‹ì˜ ìž‘ì„±ìž í—¤ë” í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "--author 파ë¼ë¯¸í„° 형ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "ì‹œê° í˜•ì‹ì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5138,38 +5413,38 @@ msgstr ""
"현재 커밋 메시지ì—ì„œ 사용ë˜ì§€ 않는 ì£¼ì„ ë¬¸ìžë¥¼\n"
"ì„ íƒí•  수 없습니다"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "%s ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ìŒ)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 로그 메시지를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "'%s' 로그 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "MERGE_MSG를 ì½ì„ 수 없습니다"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "MERGE_MSG를 ì½ì„ 수 없습니다"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "커밋 ì„œì‹ì„ 쓸 수 없습니다"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5184,7 +5459,7 @@ msgstr ""
"\t%s\n"
"다시 ì‹œë„하십시오.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5199,7 +5474,7 @@ msgstr ""
"\t%s\n"
"다시 ì‹œë„하십시오.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5208,7 +5483,7 @@ msgstr ""
"변경 ì‚¬í•­ì— ëŒ€í•œ 커밋 메시지를 입력하십시오. '%c' 문ìžë¡œ 시작하는\n"
"ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지를 입력하지 않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5219,149 +5494,149 @@ msgstr ""
"ì¤„ì€ ë³´ì¡´ë˜ë‹ˆ, 필요하면 ì§ì ‘ 제거하십시오. 메시지를 입력하지\n"
"않으면 ì»¤ë°‹ì´ ì¤‘ì§€ë©ë‹ˆë‹¤.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s작성ìž: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sì‹œê°: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s커미터: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "ì¸ë±ìŠ¤ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "트리를 ë§Œë“œëŠ”ë° ì˜¤ë¥˜"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "메시지를 -m ë˜ëŠ” -F 옵션으로 입력하십시오.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' ì˜µì…˜ì´ 'ì´ë¦„ <ì „ìžë©”ì¼>' 형ì‹ì´ 아니고 기존 작성ìžì—ë„ ì—†ìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "추ì ë˜ì§€ 않는 íŒŒì¼ ëª¨ë“œê°€ ('%s') 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long ë° -z ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author ë° --author ì˜µì…˜ì„ ëª¨ë‘ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다"
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "바꿀 ì‚¬í•­ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr "병합 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "커밋 빼오기 ì¤‘ì— ìžˆìŠµë‹ˆë‹¤ -- ì»¤ë°‹ì„ ë°”ê¿€ 수 없습니다."
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash ë° --fixup ì˜µì…˜ì€ ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup 옵션 ì¤‘ì— í•˜ë‚˜ë§Œ 사용할 수 있습니다."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "-m ì˜µì…˜ì€ -c/-C/-F/--fixup 옵션과 ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ì˜µì…˜ì€ -C, -c ë˜ëŠ” --amend 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
"다."
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr "경로가 ì—†ì´ --include/--only ì˜µì…˜ì„ ì“°ë©´ 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "기발하네요... ë§ˆì§€ë§‰ì„ ë³€ê²½ëœ ì¸ë±ìŠ¤ë¡œ 바꿉니다."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"-i ë˜ëŠ” -o ì—†ì´ ëª…ì‹œì ì¸ 경로를 지정했습니다. --only 경로를 가정합니다..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "ìž˜ëª»ëœ ì •ë¦¬ 모드 %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "-a 옵션과 경로를 ê°™ì´ ì‚¬ìš©í•˜ë©´ 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "ìƒíƒœë¥¼ 간략하게 표시합니다"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "브랜치 정보를 표시합니다"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "컴퓨터가 ì½ì„ 수 있는 형ì‹"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "긴 형ì‹ìœ¼ë¡œ ìƒíƒœë¥¼ 표시합니다 (기본값)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "NUL 문ìžë¡œ í•­ëª©ì„ ë냅니다"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "모드"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"추ì ë˜ì§€ 않는 파ì¼ì„ 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "무시ë˜ëŠ” 파ì¼ì„ 표시합니다"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "언제"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5369,198 +5644,198 @@ msgstr ""
"하위 ëª¨ë“ˆì˜ ë³€ê²½ì„ ë¬´ì‹œí•©ë‹ˆë‹¤. 추가 옵션: all, dirty, untracked. (기본값: "
"all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "추ì ë˜ì§€ 않는 파ì¼ì˜ 목ë¡ì„ 여러 ì—´ë¡œ 표시합니다"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "새로 만든 ì»¤ë°‹ì„ ì°¾ì•„ë³¼ 수 없습니다"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "새로 만든 ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "HEAD 분리ë¨"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (최ìƒìœ„-커밋)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "성공ì ì¸ 커밋 í›„ì— ìš”ì•½ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "커밋 메시지 ì„œì‹ì— diff를 표시합니다"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "커밋 메시지 옵션"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "파ì¼ì—ì„œ 메시지를 ì½ìŠµë‹ˆë‹¤"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "작성ìž"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "ì»¤ë°‹ì˜ ìž‘ì„±ìžë¥¼ 지정합니다"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "ì‹œê°"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "ì»¤ë°‹ì˜ ì‹œê°ì„ 지정합니다"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "메시지"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "커밋 메시지"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "커밋"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "지정한 ì»¤ë°‹ì˜ ë©”ì‹œì§€ë¥¼ 재사용하고 편집합니다"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "지정한 커밋ì—ì„œ 메시지를 재사용합니다"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr "지정한 ì»¤ë°‹ì„ ìˆ˜ì •í•˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr "지정한 ì»¤ë°‹ì„ í•©ì¹˜ëŠ”ë° autosquash í˜•ì‹ ë©”ì‹œì§€ë¥¼ 사용합니다"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "ì»¤ë°‹ì„ ë‚´ê°€ 작성한 것으로 만듭니다 (-C/-c/--amend와 ê°™ì´ ì‚¬ìš©)"
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "Signed-off-by: ì¤„ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "지정한 ì„œì‹ íŒŒì¼ì„ 사용합니다"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "커밋 íŽ¸ì§‘ì„ ê°•ì œí•©ë‹ˆë‹¤"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "기본값"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "메시지ì—ì„œ 공백과 #주ì„ì„ ì§€ì›ë‹ˆë‹¤"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "커밋 메시지 ì„œì‹ì— ìƒíƒœë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG 서명 커밋"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "커밋 내용 옵션"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "ë³€ê²½ëœ íŒŒì¼ì„ ëª¨ë‘ ì»¤ë°‹í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "지정한 파ì¼ì„ 커밋할 ì¸ë±ìŠ¤ì— 추가합니다"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "대화형으로 파ì¼ì„ 추가합니다"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "대화형으로 변경 ì‚¬í•­ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "지정한 파ì¼ë§Œ 커밋합니다"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "커밋 ì „ 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "ë¬´ì—‡ì„ ì»¤ë°‹í• ì§€ 표시합니다"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "바로 ì•ž ì»¤ë°‹ì„ ë°”ê¿‰ë‹ˆë‹¤"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "다시쓰기 후 후í¬ë¥¼ 건너ëœë‹ˆë‹¤"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "빈 변경 ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "빈 메시지와 ê°™ì´ ë³€ê²½ ì‚¬í•­ì„ ê¸°ë¡í•˜ë„ë¡ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "HEAD ì»¤ë°‹ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "ì†ìƒëœ MERGE_HEAD íŒŒì¼ (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE를 ì½ì„ 수 없습니다"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "커밋 메시지를 ì½ì„ 수 없습니다: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 메시지를 편집하지 않았습니다.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "ì»¤ë°‹ì„ ì¤‘ì§€í•©ë‹ˆë‹¤. 커밋 메시지가 비어 있습니다.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5706,7 +5981,7 @@ msgstr "ì„¤ì •ì˜ ì¶œì²˜ë¥¼ 표시합니다 (파ì¼, 표준 ìž…ë ¥, 블롭, 명ë
msgid "unable to parse default color value"
msgstr "기본 색 ê°’ì„ íŒŒì‹±í•  수 없습니다"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5721,7 +5996,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "%s 설정 파ì¼ì„ 만들 수 없습니다"
@@ -5757,7 +6032,7 @@ msgstr "ì£¼ì„ ë‹¬ë¦° %s íƒœê·¸ì— ë‚´ìž¥ëœ ì´ë¦„ì´ ì—†ìŠµë‹ˆë‹¤"
msgid "tag '%s' is really '%s' here"
msgstr "'%s' 태그가 실제 여기 '%s'입니다"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "올바른 오브ì íŠ¸ ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤ (%s)"
@@ -5850,7 +6125,7 @@ msgstr "<n>ê°œì˜ ê°€ìž¥ ìµœê·¼ì˜ íƒœê·¸ë§Œ 고려합니다 (기본값: 10)"
msgid "only consider tags matching <pattern>"
msgstr "<패턴>ê³¼ ì¼ì¹˜í•˜ëŠ” 태그만 고려합니다"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "대안으로 요약한 커밋 오브ì íŠ¸ë¥¼ 표시합니다"
@@ -5884,21 +6159,21 @@ msgstr "'%s': ì¼ë°˜ 파ì¼ì´ë‚˜ 심볼릭 ë§í¬ê°€ 아닙니다"
msgid "invalid option: %s"
msgstr "ìž˜ëª»ëœ ì˜µì…˜: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "깃 저장소가 아닙니다"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "ìž˜ëª»ëœ '%s' 오브ì íŠ¸ê°€ 주어졌습니다."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "ë‘ ê°œë³´ë‹¤ ë§Žì€ ë¸”ë¡­ì´ ì£¼ì–´ì¡ŒìŠµë‹ˆë‹¤: '%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "처리하지 ì•Šì€ '%s' 오브ì íŠ¸ê°€ 주어졌습니다."
@@ -5971,19 +6246,19 @@ msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<옵션>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "모든 리모트ì—ì„œ 가져옵니다"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ë®ì–´ì“°ì§€ ë§ê³  .git/FETCH_HEADì— ë§ë¶™ìž…니다"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "리모트 ìª½ì— ë¬¶ìŒì„ 업로드할 경로"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "로컬 브랜치를 강제로 ë®ì–´ì”니다"
@@ -5991,7 +6266,7 @@ msgstr "로컬 브랜치를 강제로 ë®ì–´ì”니다"
msgid "fetch from multiple remotes"
msgstr "여러 리모트ì—ì„œ 가져옵니다"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "모든 태그와 관련 오브ì íŠ¸ë¥¼ 가져옵니다"
@@ -6003,19 +6278,19 @@ msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "병렬ì ìœ¼ë¡œ 받아오는 하위모듈 개수"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "ë¦¬ëª¨íŠ¸ì— ì´ì œ 없는 리모트 ì¶”ì  ë¸Œëžœì¹˜ë¥¼ 잘ë¼ëƒ…니다"
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "주문형"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "하위 모듈 재귀ì ìœ¼ë¡œ 가져오기 ë°©ì‹ì„ 설정합니다"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "다운로드한 묶ìŒì„ 보존합니다"
@@ -6023,15 +6298,15 @@ msgstr "다운로드한 묶ìŒì„ 보존합니다"
msgid "allow updating of HEAD ref"
msgstr "HEAD ë ˆí¼ëŸ°ìŠ¤ ì—…ë°ì´íŠ¸ë¥¼ 허용합니다"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "ì–•ì€ ë³µì œì˜ ì»¤ë°‹ ë‚´ì—­ì„ ê¹Šê²Œ 만듭니다"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "완전한 저장소로 전환합니다"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "디렉터리"
@@ -6043,15 +6318,15 @@ msgstr "하위 모듈 경로 ì¶œë ¥ì˜ ì•žì— ì´ ë””ë ‰í„°ë¦¬ë¥¼ 붙입니다"
msgid "default mode for recursion"
msgstr "재귀 기본 모드"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow를 ì—…ë°ì´íŠ¸í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë¥¼ 허용합니다"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "ë ˆí¼ëŸ°ìŠ¤ë§µ 가져오기를 지정합니다"
@@ -6109,11 +6384,6 @@ msgstr "ê°•ì œ ì—…ë°ì´íŠ¸"
msgid "(non-fast-forward)"
msgstr "(ì •ë°©í–¥ ì§„í–‰ì´ ì•„ë‹˜)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "%sì„(를) ì—´ 수 없습니다: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6314,55 +6584,55 @@ msgstr "ì—°ê²°ì„ í™•ì¸í•˜ëŠ” 중입니다"
msgid "Checking object directories"
msgstr "오브ì íŠ¸ 디렉터리를 확ì¸í•˜ëŠ” 중입니다"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<옵션>] [<오브ì íŠ¸>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "ì ê·¼í•  수 없는 오브ì íŠ¸ë¥¼ 표시합니다"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ 표시합니다"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "태그를 알립니다"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "최ìƒìœ„ 노드를 알립니다"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "ì¸ë±ìŠ¤ 오브ì íŠ¸ 헤드 노드를 만듭니다"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "묶ìŒê³¼ ë³´ì¡° 오브ì íŠ¸ë„ 만듭니다"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "연결만 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "ë” ì—„ê²©í•˜ê²Œ 확ì¸í•©ë‹ˆë‹¤"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr ".git/lost-found ì•ˆì— ì—°ê²°ì´ ëŠì–´ì§„ 오브ì íŠ¸ë¥¼ ì”니다"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "진행 ìƒí™©ì„ 표시합니다"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "오브ì íŠ¸ë¥¼ 확ì¸í•©ë‹ˆë‹¤"
@@ -6464,215 +6734,215 @@ msgstr "트리를 ì½ì„ 수 없습니다 (%s)"
msgid "unable to grep from object of type %s"
msgstr "종류가 %sì¸ ì˜¤ë¸Œì íŠ¸ì—ì„œ grepì„ í•  수 없습니다"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "`%c' 옵션ì—는 ìˆ«ìž ê°’ì´ ì™€ì•¼ 합니다"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "'%s'ì„(를) ì—´ 수 없습니다"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "ìž‘ì—… í´ë” ëŒ€ì‹ ì— ì¸ë±ìŠ¤ì—ì„œ 검색합니다"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "깃으로 관리하지 ì•Šì€ ë‚´ìš©ì—ì„œ 찾습니다"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "추ì ë˜ëŠ” 파ì¼ê³¼ 추ì ë˜ì§€ 않는 íŒŒì¼ ëª¨ë‘ì—ì„œ 검색합니다"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'ë¡œ 지정한 파ì¼ì„ 무시합니다"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "ì¼ì¹˜í•˜ì§€ 않는 ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "ëŒ€ì†Œë¬¸ìž êµ¬ë³„í•˜ì§€ ì•Šê³  맞춥니다"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "단어 경계 ë¶€ë¶„ì— ëŒ€í•´ì„œë§Œ íŒ¨í„´ì„ ë§žì¶¥ë‹ˆë‹¤"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "ë°”ì´ë„ˆë¦¬ 파ì¼ì„ í…스트로 처리합니다"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "ë°”ì´ë„ˆë¦¬ 파ì¼ì—ì„œ íŒ¨í„´ì„ ë§žì¶”ì§€ 않습니다"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "textconv 필터를 사용해 ë°”ì´ë„ˆë¦¬ 파ì¼ì„ 처리합니다"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "최대 <깊ì´> ë‹¨ê³„ë§Œí¼ ë‚´ë ¤ê°‘ë‹ˆë‹¤"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "POSIX 확장 ì •ê·œì‹ì„ 사용합니다"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "기본 POSIX ì •ê·œì‹ì„ 사용합니다 (기본값)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "íŒ¨í„´ì„ ê³ ì • 문ìžì—´ë¡œ í•´ì„합니다"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "펄과 호환ë˜ëŠ” ì •ê·œì‹ì„ 사용합니다"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "줄 번호를 표시합니다"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "íŒŒì¼ ì´ë¦„ì„ ìµœìƒìœ„ 디렉터리 ìƒëŒ€ 경로로 표시합니다"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "ì¼ì¹˜í•˜ëŠ” ì¤„ì„ í‘œì‹œí•˜ì§€ ì•Šê³  íŒŒì¼ ì´ë¦„만 표시합니다"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches 옵션과 ë™ì¼"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "ì¼ì¹˜í•˜ì§€ 않는 파ì¼ì˜ ì´ë¦„만 표시합니다"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "íŒŒì¼ ì´ë¦„ 다ìŒì— NULì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "ì¼ì¹˜í•˜ëŠ” ì¤„ì„ í‘œì‹œí•˜ì§€ ì•Šê³  ì¼ì¹˜í•˜ëŠ” 수를 표시합니다"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "ì¼ì¹˜í•˜ëŠ” ë¶€ë¶„ì„ ê°•ì¡°í•©ë‹ˆë‹¤"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "다른 íŒŒì¼ ì‚¬ì´ì— ì¼ì¹˜í•˜ëŠ” ë¶€ë¶„ì˜ ì‚¬ì´ì— 빈 ì¤„ì„ ì¶œë ¥í•©ë‹ˆë‹¤"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr "ê°™ì€ íŒŒì¼ì—ì„œ 여러 개가 ì¼ì¹˜í•˜ë©´ íŒŒì¼ ì´ë¦„ì„ í•œ 번만 표시합니다"
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ì•žë’¤ì— ì»¨í…스트를 <n>줄 표시합니다"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ì•žì— ì»¨í…스트를 <n>줄 표시합니다"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "ì¼ì¹˜í•˜ëŠ” 부분 ë’¤ì— ì»¨í…스트를 <n>줄 표시합니다"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "<n>ê°œì˜ ìž‘ì—… 스레드를 사용합니다"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "-C NUM ì˜µì…˜ì˜ ì¤„ìž„"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "ì¼ì¹˜ 항목 ì•žì— í•¨ìˆ˜ ì´ë¦„ ì¤„ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "들어 있는 함수를 표시합니다"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "파ì¼ì—ì„œ íŒ¨í„´ì„ ì½ìŠµë‹ˆë‹¤"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "<패턴>ê³¼ ì¼ì¹˜"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "-e 옵션으로 지정한 íŒ¨í„´ì„ ê²°í•©í•©ë‹ˆë‹¤"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "출력하지 ì•Šê³  ì¼ì¹˜í•˜ëŠ” í•­ëª©ì„ exit() ìƒíƒœ 번호로 리턴합니다"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr "모든 패턴과 ì¼ì¹˜í•˜ëŠ” 파ì¼ì˜ ì¼ì¹˜í•˜ëŠ” 부분만 표시합니다"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "grep 표현ì‹ì— 대한 파싱 트리를 표시합니다"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "페ì´ì €"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "ì¼ì¹˜í•˜ëŠ” 파ì¼ì„ 페ì´ì € 프로그램ì—ì„œ 표시합니다"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1) ì‹¤í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (ì´ ë¹Œë“œì—서는 무시)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "íŒ¨í„´ì„ ì§€ì •í•˜ì§€ 않았습니다."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ìž˜ëª»ëœ ìŠ¤ë ˆë“œ 수를 지정했습니다 (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ì˜µì…˜ì€ ìž‘ì—… í´ë”ì—서만 ë™ìž‘합니다"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"--cached ë˜ëŠ” --untracked ì˜µì…˜ì€ --no-index 옵션과 ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index ë˜ëŠ” --untracked ì˜µì…˜ì€ ë¦¬ë¹„ì „ê³¼ ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard ì˜µì…˜ì€ ì¶”ì ë˜ëŠ” ë‚´ìš©ì— ëŒ€í•´ 쓸 수 없습니다."
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "--cached 옵션과 트리를 ëª¨ë‘ ì§€ì •í–ˆìŠµë‹ˆë‹¤."
@@ -6761,8 +7031,8 @@ msgstr "emacsclient '%d' ë²„ì „ì€ ë„ˆë¬´ 과거 (< 22) 버전입니다."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "실행 실패: '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "실행 실패: '%s'"
#: builtin/help.c:205
#, c-format
@@ -7018,104 +7288,105 @@ msgstr "극심한 혼란"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "로컬 오브ì íŠ¸ %dê°œ 마침"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "로컬 오브ì íŠ¸ %dê°œ 마침"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%sì— ëŒ€í•´ 예ìƒì¹˜ 못한 í…Œì¼ ì²´í¬ì„¬ (ë””ìŠ¤í¬ ì†ìƒ?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "묶ìŒì— 알아내지 못한 ë¸íƒ€ %d개가 있습니다"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "추가한 오브ì íŠ¸ë¥¼ deflateí•  수 없습니다 (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "%s 로컬 오브ì íŠ¸ê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "ë¬¶ìŒ íŒŒì¼ì„ ë‹«ëŠ”ë° ì˜¤ë¥˜"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "'%s' ë³´ì¡´ 파ì¼ì„ 쓸 수 없습니다"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "ì“´ '%s' ë³´ì¡´ 파ì¼ì„ 닫지 못했습니다"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "ë¬¶ìŒ íŒŒì¼ì„ 저장할 수 없습니다"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "ì¸ë±ìŠ¤ 파ì¼ì„ 저장할 수 없습니다"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "ìž˜ëª»ëœ pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "스레드 ê¸°ëŠ¥ì´ ì—†ìŠµë‹ˆë‹¤. %s 무시"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "기존 '%s' ë¬¶ìŒ íŒŒì¼ì„ ì—´ 수 없습니다"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 기존 ë¬¶ìŒ idx 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "ë¸íƒ€ 아님: 오브ì íŠ¸ %dê°œ"
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "ì²´ì¸ ê¸¸ì´ = %d: 오브ì íŠ¸ %luê°œ"
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "'%s' 묶ìŒíŒŒì¼ ì´ë¦„ì´ '.pack'으로 ë나지 않습니다"
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "현재 디렉터리로 ëŒì•„올 수 없습니다"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "ìž˜ëª»ëœ %s"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ì˜µì…˜ì€ --stdin 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "'%s' 묶ìŒíŒŒì¼ ì´ë¦„ì´ '.pack'으로 ë나지 않습니다"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify ì˜µì…˜ì— ë¬¶ìŒíŒŒì¼ ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
@@ -7154,27 +7425,27 @@ msgstr "'%s'ì„(를) '%s'ì— ë³µì‚¬í•  수 없습니다"
msgid "ignoring template %s"
msgstr "%s ì„œì‹ì„ 무시합니다"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "%sì— ì„œì‹ì´ 없습니다"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "'%2$s'ì—ì„œ ìž˜ëª»ëœ í˜•ì‹ ë²„ì „ %1$dì˜ ì„œì‹ì„ 복사하지 않습니다"
+msgid "not copying templates from '%s': %s"
+msgstr "'%s'ì—ì„œ ì„œì‹ì„ 복사하지 않습니다: %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s 파ì¼ì´ ì´ë¯¸ 있습니다"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "íŒŒì¼ ì¢…ë¥˜ %dë²ˆì„ ì²˜ë¦¬í•  수 없습니다"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "%sì„(를) %s(으)ë¡œ 옮길 수 없습니다"
@@ -7182,24 +7453,24 @@ msgstr "%sì„(를) %s(으)ë¡œ 옮길 수 없습니다"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s 깃 저장소, 위치 %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "다시 초기화: 기존"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "초기화: 빈"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " 공유"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7207,25 +7478,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<ì„œì‹-디렉터리>] [--shared[=<권"
"한>]] [<디렉터리>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "권한"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "깃 저장소를 다른 사용ìžê°€ 공유할 수 있게 지정"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "%sì— ëŒ€í•´ mkdir를 í•  수 없습니다"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "%sì— ëŒ€í•´ chdir를 í•  수 없습니다"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7234,7 +7505,7 @@ msgstr ""
"%s (ë˜ëŠ” --work-tree=<디렉터리>) 허용ë˜ì§€ ì•ŠìŒ. %s (ë˜ëŠ” --git-"
"dir=<directory>) ì§€ì •ì´ ì—†ìœ¼ë©´"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ìž‘ì—… í´ë” '%s'ì— ì ‘ê·¼í•  수 없습니다"
@@ -7280,263 +7551,315 @@ msgstr "git show [<옵션>] <오브ì íŠ¸>..."
msgid "invalid --decorate option: %s"
msgstr "ìž˜ëª»ëœ --decorate 옵션: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "diff를 출력하지 않습니다"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "소스를 표시합니다"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "ë©”ì¼ ë§µ 파ì¼ì„ 사용합니다"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "꾸미기 옵션"
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr "파ì¼ì—ì„œ n,m ë²”ìœ„ì˜ ì¤„ì„ ì²˜ë¦¬í•©ë‹ˆë‹¤ (1부터 시작)"
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "최종 출력: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ìž˜ëª»ëœ íŒŒì¼"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "%s 오브ì íŠ¸ë¥¼ ì½ì„ 수 없습니다"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "알 수 없는 종류: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers ì„¤ì •ì— ê°’ì´ ì—†ìŒ"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "출력 ë””ë ‰í„°ë¦¬ì˜ ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "%s 패치 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "정확히 í•˜ë‚˜ì˜ ë²”ìœ„ê°€ 필요합니다."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "범위가 아닙니다."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "커버레터는 ì „ìžë©”ì¼ í˜•ì‹ì´ì–´ì•¼ 합니다"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "정신나간 in-reply-to í—¤ë”: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<옵션>] [<시작시ê°> | <리비전-범위>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "출력 디렉터리가 ë‘ê°œ?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "알 수 없는 커밋 %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "'%s'ì„(를) 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ ì•Œì•„ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "정확한 병합 기준ì ì„ ì°¾ì„ ìˆ˜ 없습니다."
+
+#: builtin/log.c:1235
+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=<기준ì -커밋-ID>' 옵션으로 ê¸°ì¤€ì  ì»¤ë°‹ì„ ì§€ì •í• \n"
+"ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "정확한 병합 기준ì ì„ ì°¾ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "ê¸°ì¤€ì  ì»¤ë°‹ì€ ë¦¬ë¹„ì „ 목ë¡ì˜ ìƒìœ„ 커밋ì´ì–´ì•¼ 합니다"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "ê¸°ì¤€ì  ì»¤ë°‹ì€ ë¦¬ë¹„ì „ 목ë¡ì— 들어 있으면 안 ë©ë‹ˆë‹¤"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "패치 ID를 알아낼 수 없습니다"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "í•˜ë‚˜ì˜ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCh n/m]ì„ ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "여러 ê°œ íŒ¨ì¹˜ì— ëŒ€í•´ì„œë„ [PATCH]를 붙입니다"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "패치를 표준 출력으로 표시합니다"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "커버레터를 만듭니다"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "출력 íŒŒì¼ ì´ë¦„ì— ê°„ë‹¨í•œ ì¼ë ¨ 번호를 사용합니다"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "확장ìž"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' 대신 <확장ìž>를 사용합니다"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "패치 번호를 1 대신 <n>ì—ì„œ 시작합니다"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "시리즈를 N번째 re-roll로 표시합니다"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] 대신 [<ì ‘ë‘ì–´>]를 사용합니다"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "ê²°ê³¼ 파ì¼ì„ <디렉터리>ì— ì €ìž¥í•©ë‹ˆë‹¤"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]를 ìžë¥´ê±°ë‚˜ 추가하지 않습니다"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "ë°”ì´ë„ˆë¦¬ diff를 만들지 않습니다"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "From í—¤ë”ì—ì„œ ëª¨ë‘ 0ì¸ í•´ì‹œë¥¼ 출력합니다"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "ì—…ìŠ¤íŠ¸ë¦¼ì— ìžˆëŠ” 패치를 í¬í•¨í•˜ì§€ 않습니다"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr "기본값 (패치 + 통계) 대신 패치 형ì‹ì„ 표시합니다"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "메시징"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "í—¤ë”"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "ì „ìžë©”ì¼ í—¤ë”"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "ì „ìžë©”ì¼"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "To: í—¤ë”를 추가합니다"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "Cc: í—¤ë”를 추가합니다"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "ì‹ ì›"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "<ì‹ ì›>ì—ì„œ From 주소를 설정합니다 (없으면 커미터 주소 ì‹ ì› ì‚¬ìš©)"
-#: builtin/log.c:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "메시지-ID"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "첫 ë©”ì¼ì„ <메시지-ID>ì— ëŒ€í•œ 답장 ë©”ì¼ë¡œ 만듭니다"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "경계"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "패치를 첨부합니다"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "패치를 ë³¸ë¬¸ì— í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "ë©”ì‹œì§€ì— ìŠ¤ë ˆë“œë¥¼ 사용, 스타ì¼: shallow, deep"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "서명"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "ë² ì´ìŠ¤-커밋"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "전제조건 트리 정보를 패치 ì‹œë¦¬ì¦ˆì— ì¶”ê°€í•©ë‹ˆë‹¤"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "파ì¼ì—ì„œ ì„œëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "패치 íŒŒì¼ ì´ë¦„ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix ë° -k ì˜µì…˜ì€ í•˜ë‚˜ë§Œ ì¨ì•¼ 합니다."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check ì˜µì…˜ì€ ì•žë’¤ê°€ 맞지 않습니다"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "표준 출력ì´ë‚˜ 디렉터리 ì¤‘ì— í•˜ë‚˜ë§Œ 지정해야 합니다."
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' 서명 파ì¼ì„ ì½ì„ 수 없습니다"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "출력 파ì¼ì„ ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7544,11 +7867,6 @@ msgstr ""
"추ì ë˜ëŠ” 리모트 브랜치를 ì°¾ì„ ìˆ˜ 없습니다. <업스트림>ì„ ìˆ˜ë™ìœ¼ë¡œ 지정하십시"
"오.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "알 수 없는 커밋 %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<옵션>] [<파ì¼>...]"
@@ -7739,171 +8057,175 @@ msgstr "git merge [<옵션>] <메시지> HEAD <커밋>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "`m' 옵션ì—는 ê°’ì´ í•„ìš”í•©ë‹ˆë‹¤"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "'%s' 병합 ì „ëžµì„ ì°¾ì„ ìˆ˜ 없습니다.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "사용 가능한 ì „ëžµì€:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "사용 가능한 ì‚¬ìš©ìž ì„¤ì • ì „ëžµì€:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "ë³‘í•©ì´ ëë‚  ë•Œ diffstatì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(--stat 옵션과 ë™ì¼)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "병합 ì»¤ë°‹ì˜ ë©”ì‹œì§€ì— shortlog í•­ëª©ì„ (최대 <n>ê°œ) 추가합니다"
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "병합하는 대신 í•˜ë‚˜ì˜ ì»¤ë°‹ì„ ë§Œë“­ë‹ˆë‹¤"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "ë³‘í•©ì´ ì„±ê³µí•˜ë©´ ì»¤ë°‹ì„ í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "커밋 ì „ì— ë©”ì‹œì§€ë¥¼ 편집합니다"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤ (기본값)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "ì •ë°©í–¥ ì§„í–‰ì´ ë¶ˆê°€ëŠ¥í•˜ë©´ 중지합니다"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "ì´ë¦„ ë¶™ì¸ ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "ì „ëžµ"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "사용할 병합 전략"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "옵션=값"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "ì„ íƒí•œ 병합 ì „ëžµì— ëŒ€í•œ 옵션"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "병합 커밋 메시지 (ì •ë°©í–¥ì´ ì•„ë‹Œ ë³‘í•©ì— ëŒ€í•´)"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "현재 진행 ì¤‘ì¸ ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "관계 없는 커밋 ë‚´ì—­ì˜ ë³‘í•©ì„ í—ˆìš©í•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "stash를 실행할 수 없습니다."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
-msgstr "stash 실패"
+msgstr "스태시 실패"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "올바른 오브ì íŠ¸ê°€ 아닙니다: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "read-tree 실패"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (í•©ì¹  ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "커밋 합치기 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "'%s'ì— ì“¸ 수 없습니다"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "SQUASH_MSG를 쓰는 중"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "SQUASH_MSG를 마치는 중"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "병합 메시지가 없습니다 -- HEAD를 ì—…ë°ì´íŠ¸í•˜ì§€ 않습니다\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s'ì´(ê°€) ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "ìž˜ëª»ëœ branch.%s.mergeoptions 문ìžì—´: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "ë‘ ê°œì˜ í—¤ë“œ 병합 외ì—는 처리하지 않습니다."
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursiveì— ëŒ€í•´ ì•Œ 수 없는 옵션: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "%sì— ì“¸ 수 없습니다"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "'%s'ì—ì„œ ì½ì„ 수 없습니다"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"ë³‘í•©ì„ ì»¤ë°‹í•˜ì§€ 않습니다. ë³‘í•©ì„ ë§ˆì¹˜ë ¤ë©´ 'git commit'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7919,52 +8241,52 @@ msgstr ""
"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë˜ê³ , 메시지가 비어 있으면 커밋ì„\n"
"중지합니다.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "빈 커밋 메시지."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "훌륭합니다.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "ìžë™ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 충ëŒì„ 바로잡고 ê²°ê³¼ë¬¼ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/merge.c:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s'ì€(는) ì»¤ë°‹ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "현재 브랜치가 없습니다."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•œ 리모트가 없습니다."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "현재 ë¸Œëžœì¹˜ì— ëŒ€í•´ 기본 ì—…ìŠ¤íŠ¸ë¦¼ì„ ì§€ì •í•˜ì§€ 않았습니다."
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "리모트 %2$sì—ì„œ %1$sì— ëŒ€í•œ 리모트 ì¶”ì  ë¸Œëžœì¹˜ê°€ 없습니다"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "'%s'ì„(를) ë‹«ì„ ìˆ˜ 없습니다"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "중지할 병합 ìž‘ì—…ì´ ì—†ìŠµë‹ˆë‹¤. (MERGE_HEADê°€ ì—†ìŒ)"
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7972,7 +8294,7 @@ msgstr ""
"ë³‘í•©ì„ ë§ˆì¹˜ì§€ 않았습니다. (MERGE_HEAD 있ìŒ)\n"
"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7980,100 +8302,104 @@ msgstr ""
"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있ìŒ)\n"
"병합하기 ì „ì— ë³€ê²½ ì‚¬í•­ì„ ì»¤ë°‹í•˜ì‹­ì‹œì˜¤."
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있ìŒ)"
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash ì˜µì…˜ì„ --no-ff 옵션과 ê°™ì´ ì“¸ 수 없습니다."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "ì»¤ë°‹ì„ ì§€ì •í•˜ì§€ 않았고 merge.defaultToUpstream를 설정하지 않았습니다."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "빈 헤드로 ì»¤ë°‹ì„ í•©ì¹˜ê¸°ëŠ” 지ì›í•˜ì§€ 않습니다"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "ì •ë°©í–¥ì´ ì•„ë‹Œ ì»¤ë°‹ì€ ë¹ˆ 헤드ì—서는 앞뒤가 맞지 않습니다"
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 병합할 수 있는 í•­ëª©ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
msgstr "빈 헤드ì—는 정확히 í•˜ë‚˜ì˜ ì»¤ë°‹ë§Œ 병합할 수 있습니다"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "%s ì»¤ë°‹ì— ì‹ ë¢°í•˜ì§€ 않는 (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s ì»¤ë°‹ì— ìž˜ëª»ëœ (서명ìžê°€ %së¼ê³  하는) GPG ì„œëª…ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s ì»¤ë°‹ì— GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s ì»¤ë°‹ì— %sì˜ ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ì—†ìŠµë‹ˆë‹¤\n"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "관계 없는 커밋 ë‚´ì—­ì˜ ë³‘í•©ì„ ê±°ë¶€í•©ë‹ˆë‹¤"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "ì—…ë°ì´íŠ¸ 중 %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "아주 간단한 ì¸ë±ìŠ¤ 내부 ë³‘í•©ì„ ì‹œë„합니다...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "아님.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "ì •ë°©í–¥ì´ ë¶ˆê°€ëŠ¥í•˜ë¯€ë¡œ, 중지합니다."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "트리를 본래 위치로 ë˜ëŒë¦½ë‹ˆë‹¤...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "병합 ì „ëžµ %s ì‹œë„...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "ë³‘í•©ì„ ì²˜ë¦¬í•œ ì „ëžµì´ ì—†ìŠµë‹ˆë‹¤.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "ì „ëžµ %s(으)ë¡œ ë³‘í•©ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "ìˆ˜ë™ í•´ê²°ì˜ ì¤€ë¹„ë¥¼ 위해 %s ì „ëžµì„ ì‚¬ìš©í•©ë‹ˆë‹¤.\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "ìžë™ ë³‘í•©ì´ ìž˜ 진행ë˜ì—ˆìŠµë‹ˆë‹¤. 요청한대로 커밋 ì „ì— ì¤‘ì§€í•©ë‹ˆë‹¤\n"
@@ -8183,9 +8509,9 @@ msgstr "git mv [<옵션>] <ì›ë³¸>... <대ìƒ>"
msgid "Directory %s is in index and no submodule?"
msgstr "%s 디렉터리가 ì¸ë±ìŠ¤ì— 있고 하위 ëª¨ë“ˆì´ ì—†ìŠµë‹ˆë‹¤?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "계ì†í•˜ë ¤ë©´ .gitmodulesì˜ ë³€ê²½ ì‚¬í•­ì„ ìŠ¤í…Œì´ì§€ì— 넣거나 stash 하십시오"
+msgstr "계ì†í•˜ë ¤ë©´ .gitmodulesì˜ ë³€ê²½ ì‚¬í•­ì„ ìŠ¤í…Œì´ì§€ì— 넣거나 스태시 하십시오"
#: builtin/mv.c:90
#, c-format
@@ -8261,48 +8587,48 @@ msgstr "%s, ì›ë³¸=%s, 대ìƒ=%s"
msgid "Renaming %s to %s\n"
msgstr "ì´ë¦„ 바꾸기, '%s'ì—ì„œ '%s'(으)ë¡œ\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s'ì˜ ì´ë¦„ 바꾸기가 실패했습니다"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<옵션>] <커밋>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<옵션>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<옵션>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "ì´ë¦„만 표시 (SHA-1 ì—†ì´)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "ì»¤ë°‹ì„ ì§€ì •í•  ë•Œ 태그만 사용합니다"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "<패턴>ê³¼ ì¼ì¹˜í•˜ëŠ” ë ˆí¼ëŸ°ìŠ¤ë§Œ 사용합니다"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ì—ì„œ ì ‘ê·¼ 가능한 모든 커밋 목ë¡ì„ 표시합니다"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "표준입력ì—ì„œ ì½ìŠµë‹ˆë‹¤"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "`ì •ì˜ë˜ì§€ ì•Šì€' ì´ë¦„ 표시를 허용합니다 (기본값)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "ìž…ë ¥ì˜ íƒœê·¸ ë ˆí¼ëŸ°ìŠ¤ë¥¼ ë”°ë¼ê°‘니다 (내부 사용)"
@@ -8449,24 +8775,16 @@ msgstr "노트 오브ì íŠ¸ë¥¼ 쓸 수 없습니다"
msgid "The note contents have been left in %s"
msgstr "노트 ë‚´ìš©ì€ %sì— ë‚¨ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "'%s'ì„(를) ì½ì„ 수 없습니다"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s'ì„(를) 열거나 ì½ì„ 수 없습니다"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "'%s'ì„(를) 올바른 ë ˆí¼ëŸ°ìŠ¤ë¡œ ì•Œì•„ë‚´ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8479,7 +8797,7 @@ msgstr "ë¸”ë¡­ì´ ì•„ë‹Œ '%s' 오브ì íŠ¸ì— 대해 노트 ë°ì´í„°ë¥¼ ì½ì„
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "파ë¼ë¯¸í„°ê°€ 너무 많습니다"
@@ -8526,7 +8844,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "%s 오브ì íŠ¸ì— 대한 기존 노트를 ë®ì–´ì”니다\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s 오브ì íŠ¸ì— 대한 노트를 제거합니다\n"
@@ -8566,15 +8884,15 @@ msgstr ""
"-m/-F/-c/-C ì˜µì…˜ì€ 'edit' 하위 ëª…ë ¹ì— ëŒ€í•´ ì‚¬ìš©ì„ ê¶Œí•˜ì§€ 않습니다.\n"
"ëŒ€ì‹ ì— 'git notes add -f -m/-F/-c/-C' ëª…ë ¹ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "ì¼ë°˜ 옵션"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "병합 옵션"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8582,49 +8900,49 @@ msgstr ""
"주어진 ì „ëžµì„ ì‚¬ìš©í•´ 노트 충ëŒì„ 해결합니다 (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ 커밋"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr "병합하지 ì•Šì€ ë…¸íŠ¸ë¥¼ 커밋해 노트 ë³‘í•©ì„ ë§ˆì¹©ë‹ˆë‹¤"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "노트 병합 해결 중지"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "노트 ë³‘í•©ì„ ì¤‘ì§€í•©ë‹ˆë‹¤"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "%s 위치로 노트 ë³‘í•©ì´ ì´ë¯¸ %sì—ì„œ 진행중입니다"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "%s 오브ì íŠ¸ì— 노트가 없습니다\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "없는 노트를 제거하려는 ì‹œë„를 오류가 ì•„ë‹Œ 것으로 취급합니다"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 오브ì íŠ¸ ì´ë¦„ì„ ì½ìŠµë‹ˆë‹¤"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "노트-ë ˆí¼ëŸ°ìŠ¤"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "<노트-ë ˆí¼ëŸ°ìŠ¤>ì—ì„œ 노트를 사용합니다"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
@@ -8647,166 +8965,170 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "deflate 오류 (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "배트맵 쓰기를 하지 않습니다. 묶ìŒì€ pack.packSizeLimit ê°’ì— ë”°ë¼ ìª¼ê°œì§‘ë‹ˆë‹¤"
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr "오브ì íŠ¸ 쓰는 중"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "묶ìŒì— 들어있지 ì•Šì€ ì˜¤ë¸Œì íŠ¸ê°€ 있으므로, 비트맵 쓰기를 하지 않습니다"
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "오브ì íŠ¸ 압축하는 중"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "지ì›í•˜ì§€ 않는 ì¸ë±ìŠ¤ 버전 %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "ìž˜ëª»ëœ ì¸ë±ìŠ¤ 버전 '%s'"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•˜ì§€ 않습니다"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "오브ì íŠ¸ 쓰기 단계ì—ì„œ ì§„í–‰ë¥ ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "ì§„í–‰ë¥ ì´ í‘œì‹œë  ë•Œ --all-progress와 비슷합니다"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "버전[,오프셋]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr "지정한 ë²„ì „ì˜ ì¸ë±ìŠ¤ 형ì‹ì— ë”°ë¼ ë¬¶ìŒ ì¸ë±ìŠ¤ 파ì¼ì„ ì”니다"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "출력 ë¬¶ìŒ íŒŒì¼ì˜ 최대 í¬ê¸°"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "ë³´ì¡° 오브ì íŠ¸ 저장소ì—ì„œ 빌려온 오브ì íŠ¸ë¥¼ 무시합니다"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "ë¬¶ìŒ ì˜¤ë¸Œì íŠ¸ë¥¼ 무시합니다"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ 단위로 제한합니다"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr "ë¬¶ìŒ ìœˆë„우를 오브ì íŠ¸ ë‹¨ìœ„ì— ì¶”ê°€ë¡œ 메모리 단위로 제한합니다"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "결과물 묶ìŒì—ì„œ 허용ë˜ëŠ” 최대 길ì´ì˜ ë¸íƒ€ ì²´ì¸"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "기존 ë¸íƒ€ë¥¼ 재사용합니다"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "기존 오브ì íŠ¸ë¥¼ 재사용합니다"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA 오브ì íŠ¸ë¥¼ 사용합니다"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr "최ìƒì˜ ë¸íƒ€ ì¼ì¹˜ë¥¼ ê²€ìƒ‰í•˜ëŠ”ë° ìŠ¤ë ˆë“œë¥¼ 사용합니다"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "빈 ë¬¶ìŒ ì¶œë ¥ì„ ë§Œë“¤ì§€ 않습니다"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "표준 ìž…ë ¥ì—ì„œ 리비전 ì¸ìžë¥¼ ì½ìŠµë‹ˆë‹¤"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "묶지 않는 오브ì íŠ¸ 수를 제한합니다"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "모든 ë ˆí¼ëŸ°ìŠ¤ì—ì„œ ì ‘ê·¼ 가능한 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "reflog 항목ì—ì„œ ë ˆí¼ëŸ°ìŠ¤í•  수 있는 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "ì¸ë±ìŠ¤ì—ì„œ< ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "묶ìŒì„ 표준 출력으로 출력합니다"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr "묶ìŒì— 들어갈 오브ì íŠ¸ë¥¼ ë ˆí¼ëŸ°ìŠ¤í•˜ëŠ” 태그 오브ì íŠ¸ë¥¼ í¬í•¨í•©ë‹ˆë‹¤"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "ì ‘ê·¼ 불가능 오브ì íŠ¸ë¥¼ 보존합니다"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "ì‹œê°"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "<ì‹œê°>보다 새로운 ì ‘ê·¼ 불가능 오브ì íŠ¸ì˜ 묶ìŒì„ 풉니다"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "ì–‡ì€ ë¬¶ìŒì„ 만듭니다"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "ì–•ì€ ê°€ì ¸ì˜¤ê¸°ì— ì í•©í•œ 묶ìŒì„ 만듭니다"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "해당하는 .keep 파ì¼ì´ 있는 묶ìŒì„ 무시합니다"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "ë¬¶ìŒ ì••ì¶• 단계"
# FIXME: graft?
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "붙어 있는 ì»¤ë°‹ì„ ìˆ¨ê¸°ì§€ 않습니다"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr "가능하면 비트맵 ì¸ë±ìŠ¤ë¥¼ 사용해 오브ì íŠ¸ 세기 ì†ë„를 높입니다"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "ë¬¶ìŒ ì¸ë±ìŠ¤ì™€ ê°™ì´ ë¹„íŠ¸ë§µ ì¸ë±ìŠ¤ë¥¼ ì”니다"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "오브ì íŠ¸ 개수 세는 중"
@@ -8834,15 +9156,15 @@ msgstr "ì¤‘ë³µëœ ì˜¤ë¸Œì íŠ¸ 제거"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <ì‹œê°>] [--] [<헤드>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "제거하지 않고, 보여주기만 합니다"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "잘ë¼ë‚¸ 오브ì íŠ¸ë¥¼ 알립니다"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "<ì‹œê°>보다 오래 ëœ ì˜¤ë¸Œì íŠ¸ê°€ 만료ë©ë‹ˆë‹¤"
@@ -8854,61 +9176,65 @@ msgstr "precious-objects 저장소ì—ì„œ 잘ë¼ë‚¼ 수 없습니다"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<옵션>] [<저장소> [<ë ˆí¼ëŸ°ìŠ¤ëª…세>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "병합 관련 옵션"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "변경 ì‚¬í•­ì„ ì ìš©í•  ë•Œ 병합하는 대신 리베ì´ìŠ¤í•©ë‹ˆë‹¤"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "ì •ë°©í–¥ ì§„í–‰ì„ í—ˆìš©í•©ë‹ˆë‹¤"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "지정한 ì»¤ë°‹ì— ì˜¬ë°”ë¥¸ GPG ì„œëª…ì´ ìžˆëŠ”ì§€ ê²€ì¦í•©ë‹ˆë‹¤"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "리베ì´ìŠ¤ ì „ê³¼ í›„ì— stash ë° stash popì„ ìžë™ìœ¼ë¡œ 합니다"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "가져오기 관련 옵션"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "병렬ì ìœ¼ë¡œ í’€ì„ ì‹¤í–‰í•  하위모듈 개수"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ffì— ëŒ€í•´ ìž˜ëª»ëœ ê°’: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: 스테ì´ì§•í•˜ì§€ ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "추가로, ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"리베ì´ìŠ¤ë¡œ í’€ì„ í•  수 없습니다: ì¸ë±ìŠ¤ì— 커밋하지 ì•Šì€ ë³€ê²½ ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "가져온 ë ˆí¼ëŸ°ìŠ¤ ì¤‘ì— ë¦¬ë² ì´ìŠ¤í•  ëŒ€ìƒ í›„ë³´ê°€ 없습니다."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "가져온 ë ˆí¼ëŸ°ìŠ¤ ì¤‘ì— ë³‘í•©í•  ëŒ€ìƒ í›„ë³´ê°€ 없습니다."
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -8916,7 +9242,7 @@ msgstr ""
"보통 ì´ëŸ° 경우는 리모트 쪽ì—는 없는 와ì¼ë“œì¹´ë“œ ë ˆí¼ëŸ°ìŠ¤ëª…세가\n"
"ì£¼ì–´ì¡Œì„ ë•Œ ì¼ì–´ë‚©ë‹ˆë‹¤."
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -8927,38 +9253,42 @@ msgstr ""
"ì´ ë¦¬ëª¨íŠ¸ëŠ” 현재 ë¸Œëžœì¹˜ì— ëŒ€í•´ 기본으로 ì„¤ì •ëœ ë¦¬ëª¨íŠ¸ê°€\n"
"아니기 때문ì—, 명령행ì—ì„œ 브랜치를 지정해야 합니다."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "현재 ì–´ë–¤ 브랜치 위ì—ë„ ìžˆì§€ 않습니다."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "ì–´ë–¤ 브랜치를 대ìƒìœ¼ë¡œ 리베ì´ìŠ¤í• ì§€ 지정하십시오."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "ì–´ë–¤ 브랜치를 대ìƒìœ¼ë¡œ 병합할지 지정하십시오."
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "ìžì„¸í•œ 정보는 git-pull(1) 페ì´ì§€ë¥¼ 참고하십시오."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<리모트>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<브랜치>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "현재 ë¸Œëžœì¹˜ì— ì¶”ì  ì •ë³´ê°€ 없습니다."
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
-msgstr ""
-"ì´ ë¸Œëžœì¹˜ì— ëŒ€í•œ ì¶”ì  ì •ë³´ë¥¼ 설정하려면 다ìŒê³¼ ê°™ì´ í•  수 있습니다:\n"
-"\n"
-" git branch --set-upstream-to=%s/<브랜치> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "ì´ ë¸Œëžœì¹˜ì— ëŒ€í•œ ì¶”ì  ì •ë³´ë¥¼ 설정하려면 다ìŒê³¼ ê°™ì´ í•  수 있습니다:"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -8967,11 +9297,15 @@ msgstr ""
"설정ì—ì„œ ë¦¬ëª¨íŠ¸ì˜ '%s' ë ˆí¼ëŸ°ìŠ¤ì™€ 병합하ë„ë¡ ì§€ì •í–ˆì§€ë§Œ,\n"
"그런 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 가져오지 않았습니다."
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash ì˜µì…˜ì€ --rebase 옵션과 ê°™ì´ ì¨ì•¼ 합니다."
+
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr "만들어지지 ì•Šì€ ë¸Œëžœì¹˜ë¥¼ ì¸ë±ìŠ¤ì— ì¶”ê°€ëœ ë³€ê²½ 사항으로 ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤."
-#: builtin/pull.c:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -8982,7 +9316,7 @@ msgstr ""
"ìž‘ì—… í´ë”를 %s 커밋ì—ì„œ ì •ë°©í–¥\n"
"진행합니다."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -8999,11 +9333,11 @@ msgstr ""
"$ git reset --hard\n"
"복구ë©ë‹ˆë‹¤."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "여러 브랜치로 리베ì´ìŠ¤í•  수 없습니다."
@@ -9367,6 +9701,18 @@ msgstr "드문 ì²´í¬ì•„웃 í•„í„° ì ìš©ì„ 건너ëœë‹ˆë‹¤"
msgid "debug unpack-trees"
msgstr "unpack-trees 디버깅"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "출력 않기"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "디렉터리를 지정해야 합니다."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9688,174 +10034,176 @@ msgstr "* 리모트 %s"
msgid " Fetch URL: %s"
msgstr " 가져오기 URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(URL ì—†ìŒ)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " 푸시 URL: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 브랜치: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, ë‹¤ìŒ ì¤‘ í•˜ë‚˜ì¼ ìˆ˜ 있습니다):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 리모트 브랜치:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (ìƒíƒœë¥¼ 질ì˜í•˜ì§€ ì•ŠìŒ)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull'ì— ì‚¬ìš©í•  로컬 브랜치를 설정:"
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " 로컬 ë ˆí¼ëŸ°ìŠ¤ë¥¼ 'git push'ë¡œ 미러ë§í•  예정"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ë¦¬ëª¨íŠ¸ì— ë§žê²Œ 설정합니다"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ë ˆí¼ëŸ°ìŠ¤/리모트/<ì´ë¦„>/HEAD ê°’ì„ ì‚­ì œí•©ë‹ˆë‹¤"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "리모트 HEAD를 결정할 수 없습니다"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"리모트 HEAD 브랜치가 여러개입니다. ë‹¤ìŒ ì¤‘ 하나를 명시ì ìœ¼ë¡œ 지정하십시오:"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "%sì„(를) 삭제할 수 없습니다"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "올바른 ë ˆí¼ëŸ°ìŠ¤ê°€ 아닙니다: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "%sì„(를) 설정할 수 없습니다"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì§‘니다!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %sì˜ ì—°ê²°ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "잘ë¼ëƒ„: %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [잘ë¼ë‚¼ 예정] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [잘ë¼ëƒ„] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "가져온 í›„ì— ë¦¬ëª¨íŠ¸ë¥¼ 잘ë¼ëƒ…니다"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "그런 리모트가 없습니다 ('%s')"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "브랜치를 추가합니다"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "리모트를 지정하지 않았습니다"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "가져오기 URLì´ ì•„ë‹ˆë¼ í‘¸ì‹œ URLì„ ì§ˆì˜í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "모든 URLì„ ë¦¬í„´í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' ë¦¬ëª¨íŠ¸ì— ëŒ€í•œ URLì„ ì„¤ì •í•˜ì§€ 않았습니다"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "푸시 URLì„ ì§€ì •í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "URLì„ ì¶”ê°€í•©ë‹ˆë‹¤"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "URLì„ ì‚­ì œí•©ë‹ˆë‹¤"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ì˜µì…˜ì„ ë‘˜ë‹¤ ì“°ë©´ 안 ë©ë‹ˆë‹¤"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ìž˜ëª»ëœ ì˜¤ëž˜ì „ URL 패턴: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "그런 URLì´ ì—†ìŠµë‹ˆë‹¤: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "í‘¸ì‹œìš©ì´ ì•„ë‹Œ 모든 URLì„ ì‚­ì œí•˜ì§€ 않습니다"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "ìžì„¸ížˆ 표시합니다 (하위 명령 ì•žì— ì™€ì•¼ 합니다)"
@@ -10359,10 +10707,6 @@ msgstr "ìž¬ê·€ì  ì œê±°ë¥¼ 허용합니다"
msgid "exit with a zero status even if nothing matched"
msgstr "아무 ê²ƒë„ ì¼ì¹˜í•˜ì§€ 않으면 ìƒíƒœ 0번으로 ë납니다"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "계ì†í•˜ë ¤ë©´ .gitmodulesì˜ ë³€ê²½ ì‚¬í•­ì„ ìŠ¤í…Œì´ì§•í•˜ê±°ë‚˜ stash하십시오"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10565,82 +10909,178 @@ msgstr "ì£¼ì„ ë¬¸ìžë¡œ 시작하는 모든 ì¤„ì„ ê±´ë„ˆë›°ê³  제거합니다
msgid "prepend comment character and space to each line"
msgstr "ê° ì¤„ì˜ ì•žì— ì£¼ì„ ë¬¸ìžì™€ ê³µë°±ì„ ë¶™ìž…ë‹ˆë‹¤"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "그런 ë ˆí¼ëŸ°ìŠ¤ê°€ 없습니다: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "ì „ì²´ ë ˆí¼ëŸ°ìŠ¤ ì´ë¦„ì´ í•„ìš”í•˜ì§€ë§Œ, ìž…ë ¥ì€ %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "'%s' URL í•˜ë‚˜ì˜ ë‹¨ê³„ë¥¼ 잘ë¼ë‚¼ 수 없습니다"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "ìƒëŒ€ ê²½ë¡œì— ì‚¬ìš©í•  ë˜ë‹¤ë¥¸ 기준"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ".gitmodulesì—ì„œ 하위 모듈 경로 '%s'ì— ëŒ€í•œ URLì´ ì—†ìŠµë‹ˆë‹¤"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "하위 모듈 경로 '%s'ì— ëŒ€í•œ URLì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "'%3$s' ê²½ë¡œì— ëŒ€í•´ '%1$s' (%2$s) 하위 모듈 등ë¡\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "경고: '%s' 하위 ëª¨ë“ˆì— ëŒ€í•´ 커맨드 ì—…ë°ì´íŠ¸ 모드가 제안ë˜ì—ˆìŠµë‹ˆë‹¤\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "'%s' 하위 ëª¨ë“ˆì— ëŒ€í•´ ì—…ë°ì´íŠ¸ 모드 등ë¡ì´ 실패했습니다"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "하위 모듈 ì´ˆê¸°í™”ì— ì¶œë ¥ì„ í•˜ì§€ 않습니다"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<경로>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <경로>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "경로 '%s'ì— ëŒ€í•´ .gitmodulesì— ìžˆëŠ” 하위모듈 ë§¤í•‘ì´ ì—†ìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "새 하위 ëª¨ë“ˆì„ ë³µì œí•  ëŒ€ìƒ ìœ„ì¹˜"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "새 하위 모듈 ì´ë¦„"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "하위 ëª¨ë“ˆì„ ë³µì œí•´ 올 URL"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "ì–•ì€ ë³µì œì— ì‚¬ìš©í•  깊ì´"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
-">] [--name <ì´ë¦„>] [--url <URL>][--depth <깊ì´>] [--] [<경로>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소>] [--name <ì´ë¦„>] [--depth <깊ì´>] --url <url> --path <경로>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s'ì—ì„œ 하위 모듈 경로 '%s'ì— ë³µì œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "'%s' 파ì¼ì„ ì—´ 수 없습니다"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "%s 파ì¼ì„ ë‹«ì„ ìˆ˜ 없습니다"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s'ì— ëŒ€í•œ 하위 모듈 디렉터리를 가져올 수 없습니다"
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"ì¹˜ëª…ì  ì´ìƒ: submodule--helper 하위 ëª…ë ¹ì€ í•˜ìœ„ 명령으로 호출해야 합니다"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "'%s' 하위 모듈 경로가 초기화ë˜ì§€ 않았습니다"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "'update --init'ì„ í•˜ë ¤ê³  í•œ 것 아니었습니까?"
+
+#: builtin/submodule--helper.c:639
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "ì¹˜ëª…ì  ì´ìƒ: '%s'ì€(는) 올바른 submodule--helper 하위 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤"
+msgid "Skipping unmerged submodule %s"
+msgstr "병합하지 하위 모듈 %s 건너뜀"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "하위 모듈 '%s' 건너뜀"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "ìž‘ì—… í´ë”ë¡œ 가는 경로"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "ìž‘ì—… í´ë”ë¡œ 가는 경로, ë‚´ìž¥ëœ í•˜ìœ„ ëª¨ë“ˆì˜ ê²½ê³„ 통과"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout ë˜ëŠ” none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "지정한 ê°œìˆ˜ì˜ ë¦¬ë¹„ì „ì—ì„œ 잘린 ì–•ì€ ë³µì œë¥¼ 만듭니다"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "병렬 작업 개수"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "복제 ê³¼ì •ì„ í‘œì‹œí•˜ì§€ 않습니다"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "파ë¼ë¯¸í„° ì—…ë°ì´íŠ¸ì— ê°’ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule--helper 하위 ëª…ë ¹ì€ í•˜ìœ„ 명령으로 호출해야 합니다"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s'ì€(는) 올바른 submodule--helper 하위 ëª…ë ¹ì´ ì•„ë‹™ë‹ˆë‹¤"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10694,27 +11134,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <태그ì´ë¦„>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "태그 ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤: %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "'%s' 태그가 없습니다."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "'%s' 태그 삭제함 (과거 %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "'%s' 태그를 ê²€ì¦í•  수 없습니다"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10727,7 +11162,7 @@ msgstr ""
" %s\n"
"'%c' 문ìžë¡œ 시작하는 ì¤„ì€ ë¬´ì‹œë©ë‹ˆë‹¤.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10858,21 +11293,21 @@ msgstr "--merged ë° --no-merged ì˜µì…˜ì€ -l 옵션과 ê°™ì´ ì¨ì•¼ 합니다.
msgid "only one -F or -m option is allowed."
msgstr "í•˜ë‚˜ì˜ -F ë˜ëŠ” -m 옵션만 쓸 수 있습니다."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "파ë¼ë¯¸í„°ê°€ 너무 많습니다"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s'ì€9는) 올바른 태그 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "태그 '%s'ì´(ê°€) ì´ë¯¸ 있습니다"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "태그 '%s' ì—…ë°ì´íŠ¸ (과거 %s)\n"
@@ -11121,7 +11556,7 @@ msgstr "git verify-commit [-v | --verbose] <커밋>..."
msgid "print commit contents"
msgstr "커밋 ë‚´ìš©ì„ í‘œì‹œí•©ë‹ˆë‹¤"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "ì›ë³¸ GPG ìƒíƒœë¥¼ 출력합니다"
@@ -11141,7 +11576,7 @@ msgstr "통계만 표시"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <태그>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "태그 내용 표시"
@@ -11157,68 +11592,72 @@ msgstr "git worktree prune [<옵션>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<옵션>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없습니다"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì„ ì½ì„ 수 없습니다 (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 올바르지 않습니다"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "worktrees/%s 제거: gitdir 파ì¼ì´ 없는 위치를 가리킵니다"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %s"
+msgid "failed to remove '%s'"
+msgstr "'%s' ì œê±°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "'%s'ì´(ê°€) ì´ë¯¸ 있습니다"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s'ì˜ ë””ë ‰í„°ë¦¬ë¥¼ 만들 수 없습니다"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "%s 준비 중 (ID %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "다른 ìž‘ì—… í´ë”ì—ì„œ ì²´í¬ì•„웃했ë”ë¼ë„ <브랜치>를 ì²´í¬ì•„웃합니다"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "새 브랜치를 만듭니다"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "브랜치를 만들거나 리셋합니다"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "HEAD를 해당 커밋ì—ì„œ 분리합니다"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "새 ìž‘ì—… í´ë”를 만듭니다"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
@@ -11238,7 +11677,7 @@ msgstr "하위 디렉터리 <ì ‘ë‘ì–´>ì— ëŒ€í•´ 트리 오브ì íŠ¸ë¥¼ ì”니ë
msgid "only useful for debugging"
msgstr "디버깅 ìš©ë„로만 사용"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "디버깅 메시지를 표준오류로 출력합니다"
@@ -11252,7 +11691,7 @@ msgstr ""
"목ë¡ì„ ë³¼ 수 있습니다. 특정 하위 명령어나 ê°œë…ì— ëŒ€í•´ ì½ì–´ 보려면 'git help\n"
"<명령>' ë˜ëŠ” 'git help <ê°œë…>' ëª…ë ¹ì„ ì‹¤í–‰í•˜ì‹­ì‹œì˜¤."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "공개 키 ê³ ì •ì€ cURL 7.44.0 ì•ž 버전ì—서는 지ì›í•˜ì§€ 않습니다"
@@ -11298,7 +11737,7 @@ msgstr "저장소를 복제해 새 디렉터리로 가져 옵니다"
#: common-cmds.h:22
msgid "Record changes to the repository"
-msgstr "ë°”ë€ ì‚¬í•­ì„ ì €ìž¥ì†Œì— ê¸°ë¡í•©ë‹ˆë‹¤."
+msgstr "ë°”ë€ ì‚¬í•­ì„ ì €ìž¥ì†Œì— ê¸°ë¡í•©ë‹ˆë‹¤"
#: common-cmds.h:23
msgid "Show changes between commits, commit and working tree, etc"
@@ -11380,7 +11819,7 @@ msgstr "ë” ê°„ëžµížˆ 표시합니다"
msgid "use <n> digits to display SHA-1s"
msgstr "SHA-1 í‘œì‹œì— <n>ê°œì˜ ìˆ«ìžë¥¼ 사용합니다"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr "가능하면 ì¸ë±ìŠ¤ë¥¼ 재사용한 ì¶©ëŒ í•´ê²°ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤"
@@ -11592,16 +12031,16 @@ msgstr ""
"ì›ëž˜ 브랜치를 ì²´í¬ì•„웃하고 리베ì´ìŠ¤ë¥¼ 중지하려면, \"git rebase --abort\"를 실"
"행하십시오."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "ìžë™ìŠ¤íƒœì‹œ ì ìš©."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "\"$stash_sha1\"ì„(를) 저장할 수 없습니다"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11611,31 +12050,27 @@ msgstr ""
"변경 ì‚¬í•­ì€ ìŠ¤íƒœì‹œ ì•ˆì— ì•ˆì „í•˜ê²Œ 들어 있습니다.\n"
"언제든지 \"git stash pop\" ë˜ëŠ” \"git stash drop\"ì„ ì‹¤í–‰í•  수 있습니다.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "리베ì´ìŠ¤ ì „ 후í¬ì—ì„œ 리베ì´ìŠ¤ë¥¼ 거부했습니다."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "git-amì´ ì§„í–‰ ì¤‘ì¸ ê²ƒì²˜ëŸ¼ 보입니다. 리베ì´ìŠ¤í•  수 없습니다."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "--exec ì˜µì…˜ì€ --interactive 옵션과 ê°™ì´ ì‚¬ìš©í•´ì•¼ 합니다"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "리베ì´ìŠ¤ê°€ 진행 중ì´ì§€ 않습니다"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "--edit-todo ë™ìž‘ì€ ëŒ€í™”í˜• 리베ì´ìŠ¤ì—서만 사용할 수 있습니다."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "HEAD를 ì½ì„ 수 없습니다"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11643,12 +12078,12 @@ msgstr ""
"모든 병합 충ëŒì„ 편집하고 git add\n"
"명령으로 í•´ê²°ë˜ì—ˆë‹¤ê³  표시해야 합니다"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "'$head_name' 위치로 ëŒì•„ê°ˆ 수 없습니다"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11669,64 +12104,64 @@ msgstr ""
"ì´ ëª…ë ¹ì„ ë‹¤ì‹œ 실행하십시오. 중요한 ì‚¬í•­ì´ ë‚¨ì•„ ìžˆì„ ê²½ìš°ë¥¼\n"
"대비해 여기서 멈춥니다."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ìž˜ëª»ëœ ì—…ìŠ¤íŠ¸ë¦¼ $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 여러 ê°œì˜ ë³‘í•© ë² ì´ìŠ¤ê°€ 있습니다"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 병합 ë² ì´ìŠ¤ê°€ 없습니다"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "올바른 ì»¤ë°‹ì„ ê°€ë¦¬í‚¤ì§€ 않습니다: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ì¹˜ëª…ì  ì´ìƒ: 그런 브랜치가 없습니다: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "ìžë™ 스태시를 í•  수 없습니다"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "ìžë™ 스태시를 만들었습니다: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "커밋하거나 ìŠ¤íƒœì‹œì— ë„£ìœ¼ì‹­ì‹œì˜¤."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "현재 브랜치가 ($branch_name) 최신 ìƒíƒœìž…니다. ê°•ì œ 리베ì´ìŠ¤í•©ë‹ˆë‹¤."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "변경 사항 '$mb'ì—ì„œ '$onto'(으)ë¡œ:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr "ìž‘ì—… ì‚¬í•­ì„ ë‹¤ì‹œ 넣기 위해 먼저 헤드를 뒤로 ëŒë¦½ë‹ˆë‹¤..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
@@ -11870,26 +12305,21 @@ msgstr "브랜치 ì´ë¦„ì„ ì§€ì •í•˜ì§€ 않았습니다"
msgid "(To restore them type \"git stash apply\")"
msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "'$remoteurl' URLì—ì„œ í•˜ë‚˜ì˜ í•­ëª©ì„ ìž˜ë¼ë‚¼ 수 없습니다"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "ìƒëŒ€ 경로는 ìž‘ì—… í´ë”ì˜ ìµœìƒìœ„ì—서만 쓸 수 있습니다"
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "저장소 URL: '$repo' ê°’ì€ ì ˆëŒ€ 경로거나 ./ ë˜ëŠ” ../ë¡œ 시작해야 합니다."
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path'ì€(는) ì´ë¯¸ ì¸ë±ìŠ¤ì— 있습니다"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11900,111 +12330,93 @@ msgstr ""
"$sm_path\n"
"ì •ë§ë¡œ 추가하려면 -f ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "'$sm_path'ì˜ ê¸°ì¡´ 저장소를 ì¸ë±ìŠ¤ì— 추가합니다"
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path'ì´(ê°€) ì´ë¯¸ 있고 올바른 git 저장소가 아닙니다"
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "'$sm_name'ì— ëŒ€í•œ 깃 디렉터리가 로컬ì—ì„œ 리모트가 있는 채로 있습니다:"
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "다시 복제하지 ì•Šê³  ì´ ë¡œì»¬ 깃 디렉터리를 재활용하려면"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"'--force' ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤. 로컬 깃 디렉터리가 올바른 저장소가 아니거나"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "무슨 ì˜ë¯¸ì¸ì§€ 잘 모르겠다면 '--name' 옵션으로 다른 ì´ë¦„ì„ ì“°ì‹­ì‹œì˜¤."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "로컬 깃 디렉터리를 '$sm_name' 하위모듈로 다시 활성화합니다."
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì²´í¬ì•„웃할 수 없습니다"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ì¶”ê°€í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "'$sm_path' 하위 ëª¨ë“ˆì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "'$prefix$displaypath' ìž…ë ¥"
+msgid "Entering '$displaypath'"
+msgstr "'$displaypath' 들어ê°"
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"'$prefix$displaypath' 위치ì—ì„œ 멈춤. 스í¬ë¦½íŠ¸ì—ì„œ 0ì´ ì•„ë‹Œ ìƒíƒœë¥¼ 리턴했습니"
-"다."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "'$displaypath'ì—ì„œ 멈춤. 스í¬ë¦½íŠ¸ê°€ 0ì´ ì•„ë‹Œ ìƒíƒœë¥¼ 리턴함."
-#: git-submodule.sh:483
+#: git-submodule.sh:448
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ".gitmodulesì—ì„œ 하위 모듈 경로 '$displaypath'ì— ëŒ€í•œ URLì´ ì—†ìŠµë‹ˆë‹¤"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "하위 모듈 경로 '$displaypath'ì— ëŒ€í•œ URLì„ ë“±ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "'$displaypath' ê²½ë¡œì— ($url) 대해 등ë¡ëœ '$name' 하위 모듈"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"하위 모듈 경로 '$displaypath'ì— ëŒ€í•´ ì—…ë°ì´íŠ¸ 모드를 등ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+msgid "pathspec and --all are incompatible"
+msgstr "경로명세 ë° --all ì˜µì…˜ì€ í˜¸í™˜ë˜ì§€ 않습니다"
-#: git-submodule.sh:549
+#: git-submodule.sh:453
#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "ì •ë§ë¡œ 모든 하위 모듈 초기화를 해제하려면 '.'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "ì •ë§ë¡œ 모든 하위 모듈 초기화를 해제하려면 '--all'ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤"
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') .git 디렉터리가 들어 있습니다"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(ì •ë§ë¡œ ê·¸ 커밋 내역까지 í¬í•¨í•´ 제거하려면 'rm -rf'를 사용하십시오)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12013,133 +12425,127 @@ msgstr ""
"하위 모듈 ìž‘ì—… í´ë”ì— ('$displaypath') 로컬 수정 ì‚¬í•­ì´ ìžˆìŠµë‹ˆë‹¤. 버리려면 '-"
"f'를 사용하십시오"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "'$displaypath' 디렉터리를 지ì›ë‹ˆë‹¤"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "하위 모듈 디렉터리를 ('$displaypath') 제거할 수 없습니다"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "빈 하위 모듈 디렉터리를 ('$displaypath') 만들 수 없습니다"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"'$name' 하위 ëª¨ë“ˆì´ ($url) '$displaypath' ê²½ë¡œì— ëŒ€í•´ 등ë¡ë˜ì§€ 않았습니다"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"하위 모듈 경로가 ('$displaypath') 초기화ë˜ì§€ 않았습니다\n"
-"ì•„ë§ˆë„ 'update --init'ì´ í•„ìš”í•©ë‹ˆë‹¤?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "하위 모듈 경로ì—ì„œ ('$displaypath') 현재 ë¦¬ë¹„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: git-submodule.sh:745
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "하위 모듈 경로 '$sm_path'ì—ì„œ 가져올 수 없습니다"
-#: git-submodule.sh:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ 가져올 수 없습니다"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) ì²´í¬ì•„웃할 수 없습니다"
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1' ì²´í¬ì•„웃"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1'ì„(를) 리베ì´ìŠ¤í•  수 없습니다"
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)ë¡œ 리베ì´ìŠ¤"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'ì—ì„œ '$sha1' 병합할 수 없습니다"
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'ì—ì„œ 병합"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr ""
-"하위 모듈 경로 '$prefix$sm_path'ì—ì„œ '$command $sha1' ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "'$command $sha1' ì‹¤í–‰ì´ í•˜ìœ„ 모듈 경로 '$displaypath'ì—ì„œ 실패했습니다"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "하위 모듈 경로 '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$displaypath'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "--cached ì˜µì…˜ì€ --files 옵션과 ê°™ì´ ì“¸ 수 없습니다"
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "예ìƒì¹˜ 못한 모드 $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 경고: '$display_name'ì— '$sha1_src' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 경고: '$display_name'ì— '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" 경고: '$display_name'ì— '$sha1_src' ë° '$sha1_dst' ì»¤ë°‹ì´ ë“¤ì–´ìžˆì§€ 않습니다"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "블롭"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "재귀ì ìœ¼ë¡œ 하위 모듈 경로 '$sm_path'ì— ë“¤ì–´ê°€ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "하위 모듈 URLì„ '$displaypath'ì— ëŒ€í•´ ë™ê¸°í™”"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "ìžì„¸í•œ 정보는 git-${cmd}(1) 페ì´ì§€ë¥¼ 참고하십시오."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 321b553..f2cc93f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,16 +1,17 @@
# Portuguese translations for Git package.
# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com>
+# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt>
# This file is distributed under the same license as the Git package.
-# Contributers:
+# Contributors:
# - Marco Sousa <marcomsousa AT gmail.com>
-# Vasco Almeida <vasco13almeida@gmail.com>, 2016.
+# Vasco Almeida <vascomalmeida@sapo.pt>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-22 16:00+0000\n"
-"Last-Translator: Vasco Almeida <vasco13almeida@gmail.com>\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-31 18:17+0000\n"
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -30,23 +31,23 @@ msgid ""
"as appropriate to mark resolution and make a commit."
msgstr ""
"Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n"
-"conforme apropriado para marcá-los como resolvidos e faça commit."
+"conforme apropriado para marcá-los como resolvidos e submeta."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Merge não concluído (MERGE_HEAD presente)."
+msgstr "Não concluído a integração (MERGE_HEAD presente)."
#: advice.c:103
msgid "Please, commit your changes before merging."
-msgstr "Faça commit das suas alterações antes de efetuar merge."
+msgstr "Submeta as suas alterações antes de integrar."
#: advice.c:104
msgid "Exiting because of unfinished merge."
-msgstr "A terminar por causa de merge incompleto."
+msgstr "A terminar devido a integração incompleta."
#: archive.c:12
msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore> [<caminho>...]"
+msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
#: archive.c:13
msgid "git archive --list"
@@ -56,7 +57,7 @@ msgstr "git archive --list"
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <repo> [--exec <cmd>] [<opções>] <tree-ish> "
+"git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> "
"[<caminho>...]"
#: archive.c:15
@@ -76,7 +77,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "prefixo"
@@ -84,9 +85,9 @@ msgstr "prefixo"
msgid "prepend prefix to each pathname in the archive"
msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -120,7 +121,8 @@ msgstr "compressão ótima"
msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "repo"
@@ -153,8 +155,8 @@ msgid ""
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
-"Após resolver a causa do problema, pode tentar corrigir\n"
-"o ramo remoto que deve ser seguido invocando\n"
+"Após resolver a causa do erro, pode tentar corrigir\n"
+"o ramo remoto que deve ser seguido, invocando\n"
"\"git branch --set-upstream-to=%s%s%s\"."
#: branch.c:67
@@ -271,10 +273,15 @@ msgstr "Nome de objeto ambíguo: '%s'."
msgid "Not a valid branch point: '%s'."
msgstr "Ponto no ramo inválido: '%s'."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' já extraído em '%s'"
+msgstr "'%s' foi já extraído em '%s'"
+
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD da árvore de trabalho %s não está atualizada"
#: bundle.c:34
#, c-format
@@ -286,19 +293,19 @@ msgstr "'%s' não parece ser um ficheiro bundle v2"
msgid "unrecognized header: %s%s (%d)"
msgstr "cabeçalho não reconhecido: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
-msgstr "não é possível abrir '%s'"
+msgstr "não foi possível abrir '%s'"
#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr "O repositório não possuí estes commits pré-requisitados:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "falha ao configurar percurso de revisões"
@@ -337,21 +344,21 @@ msgstr "rev-list terminou inesperadamente"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "a referência '%s' é excluída pelas opções de rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento não reconhecido: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Criação de bundle vazio recusada."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "não é possível criar '%s'"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "index-pack terminou inesperadamente"
@@ -360,8 +367,8 @@ msgstr "index-pack terminou inesperadamente"
msgid "invalid color value: %.*s"
msgstr "valor de cor inválido: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "não foi possível analisar %s"
@@ -381,7 +388,7 @@ msgid "bad config line %d in %s %s"
msgstr "linha %d de configuração incorreta em %s %s"
#: config.c:593
-#, c-format
+#, c-format, fuzzy
msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
msgstr "valor numérico '%s' da configuração '%s' em %s %s incorreto: %s"
@@ -395,21 +402,21 @@ msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
msgid "failed to expand user dir in: '%s'"
msgstr "falha ao expandir diretório de utilizador em: '%s'"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "nível de compressão zlib %d incorreto"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido para criação de objeto: %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "não é possível analisar configuração de linha de comandos"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr ""
"ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
@@ -429,24 +436,27 @@ msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "não foi possível definir '%s' como '%s'"
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Não foi possível definir '%s' como '%s'"
+msgid "could not unset '%s'"
+msgstr "não foi possível reiniciar '%s'"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Não foi possível executar 'git rev-list'"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "falha ao escrever para rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "falha ao escrever para rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "falha ao fechar stdin de rev-list: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "falha ao fechar entrada padrão de rev-list"
#: date.c:95
msgid "in the future"
@@ -521,26 +531,26 @@ msgstr[1] "há %lu anos atrás"
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler o ficheiro de comando '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Parâmetro de dirstat desconhecido '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -549,16 +559,16 @@ msgstr ""
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -567,20 +577,20 @@ msgstr ""
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr "A cache não controlada está desativada neste sistema ou localização."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "não foi possível executar gpg."
@@ -594,28 +604,28 @@ msgstr "gpg não assinou os dados"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "não foi possível criar ficheiro temporário '%s': %s"
+msgid "could not create temporary file '%s'"
+msgstr "não foi possível criar ficheiro temporário '%s'"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "falha ao escrever assinatura destacada em '%s': %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "falha ao escrever assinatura destacada em '%s'"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': não foi possível ler %s"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s': %s"
+msgid "failed to stat '%s'"
+msgstr "falha ao invocar stat de '%s'"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s': leitura truncada %s"
+msgid "'%s': short read"
+msgstr "'%s': leitura truncada"
#: help.c:205
#, c-format
@@ -641,7 +651,7 @@ msgstr ""
#: help.c:366
msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ai ai. Não há nenhum comando do Git disponível no sistema."
+msgstr "Oh não. Não há nenhum comando do Git disponível no sistema."
#: help.c:388
#, c-format
@@ -681,12 +691,36 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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 ""
+"Não é possível criar '%s.lock': %s.\n"
+"\n"
+"Outro processo git parece estar a executar neste repositório, e.g.\n"
+"um editor aberto por 'git commit'. Certifique-se que todos os processos\n"
+"terminaram e tente de novo. Se ainda assim falhar, um processo git\n"
+"pode ter falhado anteriormente no repositório:\n"
+"remova o ficheiro manualmente para continuar."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Não é foi possível criar '%s.lock': %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "falha ao ler a cache"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "não foi possível escrever novo ficheiro de índice"
@@ -721,7 +755,7 @@ msgstr ": talvez um conflito D/F?"
#: merge-recursive.c:725
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "recusando-se a perder ficheiro não controlado em '%s'"
+msgstr "perda de ficheiro não controlado em '%s' recusada"
#: merge-recursive.c:765
#, c-format
@@ -733,7 +767,7 @@ msgstr "não é possível ler o objeto %s: '%s'"
msgid "blob expected for %s '%s'"
msgstr "blob para %s '%s' esperado"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "falha ao abrir '%s'"
@@ -750,7 +784,7 @@ msgstr "não sei o que fazer com %06o %s '%s'"
#: merge-recursive.c:939
msgid "Failed to execute internal merge"
-msgstr "Falha ao executar merge interno"
+msgstr "Falha ao executar integração interna"
#: merge-recursive.c:943
#, c-format
@@ -868,16 +902,16 @@ msgstr "%s ignorado (integrado é igual ao existente)"
#: merge-recursive.c:1646
#, c-format
msgid "Auto-merging %s"
-msgstr "Merge automático de %s"
+msgstr "A integrar automaticamente %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "submódulo"
#: merge-recursive.c:1651
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de merge em %s"
+msgstr "CONFLITO (%s): conflito de integração em %s"
#: merge-recursive.c:1737
#, c-format
@@ -898,58 +932,57 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: merge-recursive.c:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
-msgstr "Falha de merge fatal, não devia acontecer."
+msgstr "Falha de integração fatal, não devia acontecer."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Já está atualizado!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
-msgstr "falha ao realizar merge das árvores %s e %s"
+msgstr "falha ao integrar as árvores %s e %s"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Caminho não processado??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
-msgstr "A realizar merge:"
+msgstr "A integrar:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
-msgstr "merge não retornou nenhum commit"
+msgstr "a integração não retornou nenhum commit"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Não foi possível analisar o objeto '%s'"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Não é possível escrever no índice."
#: notes-utils.c:41
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"Não é possível fazer commit de árvore de notas não inicializada ou não "
-"referenciada"
+"Não é possível submeter árvore de notas não inicializada ou não referenciada"
#: notes-utils.c:100
#, c-format
@@ -959,7 +992,7 @@ msgstr "Valor de notes.rewriteMode incorreto: '%s'"
#: notes-utils.c:110
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Recusando-se a reescrever notas em %s (fora de refs/notes/)"
+msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
@@ -973,28 +1006,28 @@ msgstr "Valor incorreto de %s: '%s'"
msgid "unable to parse object: %s"
msgstr "não foi possível analisar o objeto: %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "utilização: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " ou: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-NUM"
@@ -1003,7 +1036,7 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nome do objeto malformado '%s'"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
@@ -1075,7 +1108,7 @@ msgstr ""
"Não há nada para excluir de acordo com o padrão :(excluir).\n"
"Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "não foi possível analisar o formato de --pretty"
@@ -1101,23 +1134,23 @@ msgstr ""
"GIT_INDEX_VERSION definido, mas com valor inválido.\n"
"A usar a versão %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Não foi possível abrir '%s' para escrita"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "não foi possível eliminar a referência %s: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "não foi possível eliminar as referências: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "não foi possível eliminar a referência %s"
@@ -1256,97 +1289,98 @@ msgstr "formato: falta átomo %%(end)"
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Não é possível obter %s e %s ao mesmo tempo para %s"
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s geralmente segue %s, não %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segue %s e %s em simultâneo"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Erro interno"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD não aponta para um ramo"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "ramo inexistente: '%s'"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "nenhum ramo a montante configurado para o ramo '%s'"
-#: remote.c:1695
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "o ramo a montante '%s' não está guardado como um ramo remoto seguido"
+msgstr ""
+"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
-#: remote.c:1710
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
"local"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "o ramo '%s' não tem nenhum remoto para publicar"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
"'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
"publicação"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "publicação sem destino (push.default é 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "não é possível resolver a publicação 'simple' num único destino"
-#: remote.c:2073
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
-#: remote.c:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (use \"git branch --unset-upstream\" para corrigir)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "O seu ramo está atualizado com '%s'.\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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] "O seu ramo está à frente de '%s' por %d commit.\n"
msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
-#: remote.c:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (use \"git push\" para publicar os commits locais)\n"
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1358,11 +1392,11 @@ msgstr[1] ""
"O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
"avanço rápido.\n"
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (use \"git pull\" para atualizar o seu ramo local)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1377,20 +1411,20 @@ msgstr[1] ""
"O seu ramo e '%s' divergiram,\n"
"tendo cada um %d e %d commits diferentes, respetivamente.\n"
-#: remote.c:2114
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (use \"git pull\" para incorporar o ramo remoto no seu)\n"
+msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "o ramo atual parece estar danificado"
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "o ramo atual '%s' ainda não contém nenhum commit"
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent é incompatível com --bisect"
@@ -1439,17 +1473,17 @@ msgid ""
msgstr ""
"depois de resolver os conflitos, marque os caminhos corrigidos\n"
"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
-"e faça commit do resultado com 'git commit'"
+"e submeta o resultado com 'git commit'"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Não foi possível escrever em %s"
#: sequencer.c:193
-#, fuzzy, c-format
+#, c-format
msgid "Error wrapping up %s"
-msgstr "Erro ao isolar %s"
+msgstr "Erro ao rematar %s."
#: sequencer.c:208
msgid "Your local changes would be overwritten by cherry-pick."
@@ -1461,7 +1495,7 @@ msgstr "As suas alterações locais serão substituídas por revert."
#: sequencer.c:213
msgid "Commit your changes or stash them to proceed."
-msgstr "Faça commit ou stash das suas alterações para continuar."
+msgstr "Submeta ou empilhe (stash) as suas alterações para continuar."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
#: sequencer.c:300
@@ -1494,7 +1528,7 @@ msgstr "Ficheiro de índice não integrado."
#: sequencer.c:479
#, c-format
msgid "Commit %s is a merge but no -m option was given."
-msgstr "O commit %s é um merge mas nenhuma opção -m fornecida."
+msgstr "O commit %s é uma integração mas não foi fornecida nenhuma opção -m."
#: sequencer.c:487
#, c-format
@@ -1504,7 +1538,8 @@ msgstr "O commit %s não tem o pai %d"
#: sequencer.c:491
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
-msgstr "Linha principal especificada mas o commit %s não é um merge."
+msgstr ""
+"A linha principal foi especificada mas o commit %s não é uma integração."
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
@@ -1599,12 +1634,12 @@ msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
msgid "Could not create sequencer directory %s"
msgstr "Não foi possível criar o diretório do sequenciador %s"
-#: sequencer.c:835 sequencer.c:917
-#, fuzzy, c-format
+#: sequencer.c:835 sequencer.c:916
+#, c-format
msgid "Error wrapping up %s."
-msgstr "Erro ao isolar %s."
+msgstr "Erro ao rematar %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "nenhum cherry-pick ou revert em curso"
@@ -1616,63 +1651,72 @@ msgstr "não é possível resolver HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "não é possível abortar um ramo ainda não criado"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "não é possível abrir %s: %s"
+msgid "cannot open %s"
+msgstr "não é possível abrir %s"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "não é possível ler %s: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "fim de ficheiro inesperado"
-#: sequencer.c:888
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
-#: sequencer.c:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Não foi possível formatar %s."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: não é possível efetuar cherry-pick de %s"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "Não é possível reverter como commit inicial"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "Não é possível efetuar cherry-pick numa cabeça vazia"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "falha ao ler %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "extensões de repositório desconhecidas encontradas:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
@@ -1702,31 +1746,40 @@ msgstr ""
"Analise estas referências e elimine-as se desejar. Desative esta\n"
"mensagem executando \"git config advice.objectNameWarning false\""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-"Não é possível alterar .gitmodules não integrado, resolva os conflitos do "
-"merge primeiro"
+"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
+"conflitos de integração"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Secção de .gitmodules cujo path=%s não encontrada"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Não foi possível remover o elemento %s de .gitmodules"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "falha ao preparar .gitmodules atualizado"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "não é permitido valores negativos em submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "Valor inválido de %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1746,7 +1799,7 @@ msgstr "mais do que um %s"
#: trailer.c:582
#, c-format
msgid "empty trailer token in trailer '%.*s'"
-msgstr ""
+msgstr "token terminador vazio no terminador '%.*s'"
#: trailer.c:702
#, c-format
@@ -1786,7 +1839,241 @@ msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
msgid "Could not read ref %s"
msgstr "Não foi possível ler a referência %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de trocar de ramo."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"extrair:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de integrar."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
+"integrar:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
+"\n"
+"%%sSubmeta as suas alterações ou empilhe-as (stash) antes de efetuar %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"As suas alterações locais nos seguintes ficheiros seriam substituídas por %s:"
+"\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Perder-se-iam ficheiros não controlados ao atualizar os seguintes diretórios:"
+"\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao extrair:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos ao integrar:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
+"removidos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%sMova ou remova-os antes de efetuar %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Não é possível extrair esparsamente: as seguintes entradas não estão "
+"atualizadas:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
+"atualizar a extração esparsa:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
+"extração esparsa:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "A abortar\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "A extrair ficheiros"
@@ -1824,202 +2111,195 @@ msgstr "segmento de caminho '..' inválido"
msgid "could not open '%s' for reading and writing"
msgstr "não foi possível abrir '%s' para leitura e escrita"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "não foi possível abrir '%s' para escrita"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "não foi possível abrir '%s' para leitura"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "não é possível aceder a '%s': %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "não é possível aceder a '%s'"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "não é possível de obter o diretório de trabalho atual"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "não foi possível abrir %s para escrita"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "não foi possível escrever para %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "não foi possível fechar %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Caminhos não integrados:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (use \"git reset %s <ficheiro>...\" para retirar do índice)"
+msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (use \"git rm --cached <ficheiro>...\" para retirar do índice)"
+msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
"resolvido)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
-msgstr "Alterações incluídas no próximo commit:"
+msgstr "Alterações para serem submetidas:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
-msgstr "Alterações não preparadas para commit:"
+msgstr "Alterações não preparadas para submeter:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr ""
-" (use \"git add <ficheiro>...\" para atualizar o que será incluído no "
-"commit)"
+msgstr " (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-" (use \"git add/rm <ficheiro>...\" para atualizar o que será incluído no "
-"commit)"
+" (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
"diretório de trabalho)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-" (faça commit ou descarte o conteúdo modificado ou não controlado nos "
+" (submeta ou descarte o conteúdo modificado ou não controlado nos "
"submódulos)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (use \"git %s <ficheiro>...\" para incluir no próximo commit)"
+msgstr " (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "eliminado por ambos:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "adicionado por nós:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "eliminado por eles:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "adicionado por eles:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "eliminado por nós:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "adicionado por ambos:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "modificado por ambos:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr ""
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "novo ficheiro:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "copiado:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "eliminado:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "modificado:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "nome mudado:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "tipo alterado:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "desconhecido:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "não integrado:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "novos commits, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "conteúdo modificado, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "conteúdo não controlado, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Submódulos alterados mas não atualizados:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
-msgstr "Alterações em submódulos incluídas no próximo commit:"
+msgstr "Alterações em submódulos para serem submetidas:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2027,39 +2307,39 @@ msgstr ""
"Não altere a linha acima.\n"
"Tudo o que estiver abaixo será removido."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "Há caminhos não integrados."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (corrija os conflitos e execute \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
-msgstr "Todos os conflitos foram corrigidos mas o merge continua em curso."
+msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
-msgstr " (use \"git commit\" para concluir o merge)"
+msgstr " (use \"git commit\" para concluir a integração)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Sessão am em curso."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "O patch atual está vazio."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (corrija os conflitos e execute \"git am --continue\")"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (use \"git am --skip\" para ignorar este patch)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (use \"git am --abort\" para restaurar o ramo original)"
@@ -2097,11 +2377,11 @@ msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"
#: wt-status.c:1148
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "A realizar rebase do ramo '%s' sobre '%s'."
+msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
#: wt-status.c:1153
msgid "You are currently rebasing."
-msgstr "Rebase em curso."
+msgstr "Está a rebasear neste momento."
#: wt-status.c:1167
msgid " (fix conflicts and then run \"git rebase --continue\")"
@@ -2125,11 +2405,12 @@ msgstr ""
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"A dividir um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'."
+"Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
+"sobre '%s'."
#: wt-status.c:1186
msgid "You are currently splitting a commit during a rebase."
-msgstr "A dividir um commit durante um rebase."
+msgstr "Está a dividir um commit durante um rebase."
#: wt-status.c:1189
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
@@ -2141,11 +2422,12 @@ msgstr ""
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"A editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'."
+"Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
+"'%s'."
#: wt-status.c:1198
msgid "You are currently editing a commit during a rebase."
-msgstr "A editar um commit durante um rebase."
+msgstr "Está a editar um commit durante um rebase."
#: wt-status.c:1201
msgid " (use \"git commit --amend\" to amend the current commit)"
@@ -2161,7 +2443,7 @@ msgstr ""
#: wt-status.c:1213
#, c-format
msgid "You are currently cherry-picking commit %s."
-msgstr "A realizar cherry-pick do commit %s."
+msgstr "Está a realizar cherry-pick do commit %s."
#: wt-status.c:1218
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
@@ -2181,7 +2463,7 @@ msgstr ""
#: wt-status.c:1232
#, c-format
msgid "You are currently reverting commit %s."
-msgstr "A reverter o commit %s."
+msgstr "Está a reverter o commit %s neste comento."
#: wt-status.c:1237
msgid " (fix conflicts and run \"git revert --continue\")"
@@ -2199,53 +2481,53 @@ msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)"
#: wt-status.c:1253
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Bissecção em curso, iniciada a partir do ramo '%s'."
+msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
#: wt-status.c:1257
msgid "You are currently bisecting."
-msgstr "Bissecção em curso."
+msgstr "Está a bissetar neste momento."
#: wt-status.c:1260
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (use \"git bisect reset\" para voltar ao ramo original)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "No ramo "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "rebase interativo em curso; sobre "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "rebase em curso; sobre "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD destacada em "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD destacada de "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Não se encontra em nenhum ramo neste momento."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Commit inicial"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "Ficheiros não controlados"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Ficheiros ignorados"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2257,91 +2539,92 @@ msgstr ""
"cuidado de não se esquecer de adicionar novos ficheiros\n"
"(consulte 'git help status')."
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ficheiros não controlados não listados%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Sem alterações"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"nenhuma alteração adicionada para commit (use \"git add\" e/ou \"git commit -"
-"a\")\n"
+"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
+"commit -a\")\n"
-#: wt-status.c:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
-msgstr "nenhuma alteração adicionada para commit\n"
+msgstr "nenhuma alteração adicionada para submeter\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"não foi adicionado nada para commit, mas existem ficheiros não controlados "
+"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
"(use \"git add\" para controlá-los)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-"não foi adicionado nada para commit, mas existem ficheiros não controlados\n"
+"não foi adicionado nada para submeter, mas existem ficheiros não "
+"controlados\n"
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"não há nada para fazer commit (crie/copie ficheiros e use \"git add\" para "
+"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
"controlá-los)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
-msgstr "não há nada para fazer commit\n"
+msgstr "não há nada para submeter\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-"não há nada para fazer commit (use -u para mostrar os ficheiros não "
-"controlados)\n"
+"não há nada para submeter (use -u para mostrar os ficheiros não controlados)"
+"\n"
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
-msgstr "não há nada para fazer commit, diretório de trabalho limpo\n"
+msgstr "não há nada para submeter, diretório de trabalho limpo\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Commit inicial em "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (nenhum ramo)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "desaparecido"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "atrás "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "à frente "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "falha ao invocar unlink de '%s'"
@@ -2355,7 +2638,7 @@ msgstr "git add [<opções>] [--] <caminho>..."
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "falha ao atualizar os ficheiros"
@@ -2368,7 +2651,7 @@ msgstr "remover '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Alterações não preparadas depois de atualizar o índice:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Não foi possível ler o índice"
@@ -2404,14 +2687,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simular ação"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "ser verboso"
@@ -2419,7 +2702,7 @@ msgstr "ser verboso"
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
@@ -2489,16 +2772,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Queria dizer 'git add .'?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "ficheiro de índice corrompido"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Não foi possível escrever novo ficheiro de índice"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "não foi possível ler '%s'"
@@ -2526,16 +2809,6 @@ msgstr "Falha ao copiar notas de '%s' para '%s'"
msgid "fseek failed"
msgstr "falha ao invocar fseek"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "não foi possível abrir '%s' para leitura: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "não foi possível abrir '%s' para escrita: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2545,77 +2818,77 @@ msgstr "não foi possível analisar o patch '%s'"
msgid "Only one StGIT patch series can be applied at once"
msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
-#: builtin/am.c:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Falha ao dividir patches."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "não é possível escrever o ficheiro de índice"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Após resolver este problema, execute \"%s --continue\"."
-#: builtin/am.c:1189
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
-#: builtin/am.c:1190
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Para restaurar o ramo original e interromper a aplicação dos patches, "
"execute \"%s --abort\"."
-#: builtin/am.c:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "O patch está vazio. Foi dividido incorretamente?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "linha de identidade inválida: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "não foi possível analisar o commit %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-"O repositório não tem os blobs necessários para recorrer a merge com 3 "
+"O repositório não tem os blobs necessários para recorrer a integração com 3 "
"pontos."
-#: builtin/am.c:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "A usar informação do índice para reconstruir uma árvore de base..."
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2623,40 +2896,41 @@ msgstr ""
"Editou o patch manualmente?\n"
"Não é possível aplicá-lo aos blobs registados no índice."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-"A recorrer a uma de base para aplicação de patches e merge com 3 pontos..."
+"A recorrer a uma de base para aplicação de patches e integração com 3 "
+"pontos..."
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
-msgstr "Falha ao efetuar merge das alterações."
+msgstr "Falha ao integrar as alterações."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falhou ao escrever uma árvore"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "a aplicar a um histórico vazio"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "falha ao escrever objeto de commit"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "não é possível continuar: %s não existe."
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"não é possível entrar em modo interativo sem um entrada padrão conectada a "
"um terminal."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "Corpo do commit:"
@@ -2664,35 +2938,35 @@ msgstr "Corpo do commit:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
-#: builtin/am.c:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ãndice modificado: não é possível aplicar patches (modificado: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Falha ao aplicar o patch em %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "A cópia do patch que falhou encontra-se em: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2702,7 +2976,7 @@ msgstr ""
"Se não há nada por preparar, provavelmente essas mesmas alterações\n"
"já foram introduzidas; pode querer ignorar este patch."
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2710,17 +2984,17 @@ msgstr ""
"Ainda há caminhos não integrados no índice.\n"
"Esqueceu-se de usar 'git add'?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Não foi possível analisar o objeto '%s'."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "falha ao limpar o índice"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2728,153 +3002,155 @@ msgstr ""
"Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
"Não recuando a ORIG_HEAD"
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<opções>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
-msgstr "permitir recorrer a merge com 3 pontos se necessário"
+msgstr "permitir recorrer a integração com 3 pontos se necessário"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "silencioso"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
-#: builtin/am.c:2267
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "retirar todo o conteúdo antes da linha de tesoura"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "ação"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "transmitir ao git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "raiz"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "caminho"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "num"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "formato"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "formato de apresentação de patches"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "continuar a aplicar os patches depois de resolver os conflitos"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "ignorar o patch atual"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
-msgstr "restaurar o ramo original e abortar a operação de patch"
+msgstr "restaurar o ramo original e abortar a operação de patch."
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "mentir sobre a data de commit"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "usar a data e hora atual como data de autor"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "id-chave"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(uso interno de git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2882,17 +3158,17 @@ msgstr ""
"A opção -b/--binary há muito que é ignorada e será\n"
"futuramente removida. Por favor não a use."
-#: builtin/am.c:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "falha ao ler o índice"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2901,7 +3177,7 @@ msgstr ""
"Diretório abandonado %s encontrado.\n"
"Use \"git am --abort\" para o remover."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "A operação de resolução não está em curso, não retomando."
@@ -2934,43 +3210,43 @@ msgstr "regexec retornou %d para a entra: %s"
msgid "unable to find filename in patch at line %d"
msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha "
"%d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
"inconsistente"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
"inconsistente"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recontagem: linha inesperada: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2985,77 +3261,77 @@ msgstr[1] ""
"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
"%d componentes de caminho (linha %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "o novo ficheiro depende de conteúdos antigos"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "o ficheiro eliminado ainda tem conteúdos"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompido na linha %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "o novo ficheiro %s depende de conteúdos antigos"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "o ficheiro eliminado %s ainda tem conteúdos"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binário corrompido na linha %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binário não reconhecido na linha %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch incompreensível na linha %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "não é possível ler a ligação simbólica %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "não é possível abrir ou ler %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "início de linha inválido: '%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)"
-msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)"
+msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
+msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3064,324 +3340,335 @@ msgstr ""
"ao procura por:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "falta de dados do patch binário '%s'"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "o patch binário não foi aplicado corretamente a '%s'"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
"obteve-se %s)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "falha ao aplicar o patch: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "não é possível extrair %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "falha ao ler %s"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "a ler '%s' indicado por uma ligação simbólica"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "o caminho %s foi eliminado ou mudou de nome"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: não existe no índice"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s: não tem correspondência no índice"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "patch de remoção deixa conteúdos no ficheiro"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo errado"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s é do tipo %o, esperado %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "caminho inválido '%s'"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s: já existe no índice"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: já existe no diretório de trabalho"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patch não se aplica com sucesso"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "A verificar o patch %s..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "falha ao invocar make_cache_entry em '%s'"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "não é possível remover %s do índice"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompido no submódulo %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "não é possível obter estado do novo ficheiro criado '%s'"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "não é possível adicionar %s à cache"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "a fechar o ficheiro '%s'"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s aplicado com sucesso."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "erro interno"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "A aplicar patch %%s com %d rejeição..."
msgstr[1] "A aplicar patch %%s com %d rejeições..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
-msgstr "a truncar o nome do ficheiro .rej em %.*s.rej "
+msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
+
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "não é possível abrir %s: %s"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Excerto nº%d aplicado com sucesso."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "Excerto nº%d rejeitado."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Patch '%s' ignorado."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "entrada não reconhecida"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "não foi possível ler o ficheiro de índice"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "não aplicar alterações que correspondam ao caminho fornecido"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "aplicar alterações que correspondam ao caminho fornecido"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "ignorar adições feitas pelo patch"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "garantir que o patch pode ser aplicado ao índice atual"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "aplicar um patch sem tocar na árvore de trabalho"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplicar o patch também (use com --stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
-msgstr "tentar merge com três pontos se um patch não for aplicado corretamente"
+msgstr ""
+"tentar integração com três pontos se um patch não se se aplica com êxito"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir um índice temporário baseado na informação incorporada do índice"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "os caminhos estão separados por caracteres NUL"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "ignorar alterações de espaço em branco ao procurar contexto"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "aplicar o patch em reverso"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "não esperar nenhuma linha de contexto"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "permitir a sobreposição de excertos"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar deteções incorretas de falta de nova linha no final do ficheiro"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "preceder <root> a todos os nomes de ficheiro"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way fora de um repositório"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index fora de um repositório"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached fora de um repositório"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "não é possível abrir o patch '%s'"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erro de espaço em branco reprimido"
-msgstr[1] "%d erros de espaço em branco repimidos"
+msgstr[1] "%d erros de espaço em branco reprimidos"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3447,102 +3734,101 @@ msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
msgid "Blaming lines"
msgstr "Linhas de culpa"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr ""
-"Mostar SHA-1 dos commits de limite em branco (Predefinição: desativado)"
+msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Forçar informação de progresso"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
"Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Ignorar as diferenças de espaço em branco"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "Usar o conteúdo do <ficheiro> como imagem final"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
@@ -3552,356 +3838,377 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "há 4 anos e 11 meses atrás"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opções>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"a eliminar o ramo '%s' incorporado em\n"
-" '%s', mas ainda não incorporado em HEAD."
+"a eliminar o ramo '%s' integrado em\n"
+" '%s', mas ainda não integrado em HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"ramo '%s' não eliminado, visto que ainda não foi incorporado em\n"
-" '%s', apesar de já ter sido incorporado em HEAD."
+"ramo '%s' não eliminado, visto que ainda não foi integrado em\n"
+" '%s', apesar de já ter sido integrado em HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Não foi possível pesquisar pelo objeto commit de '%s'"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, 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 ""
-"O ramo '%s' não foi totalmente incorporado.\n"
+"O ramo '%s' não foi totalmente integrado.\n"
"Se tem a certeza que o quer eliminar, execute 'git branch -D %s'."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Falha ao atualizar o ficheiro de configuração"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "não é possível usar -a com -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Não foi possível pesquisar pelo objeto commit de HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Não é possível eliminar o ramo '%s' no qual se encontra neste momento."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
-msgstr "ramo remoto seguido '%s' não encontrado."
+msgstr "ramo de monitorização remoto '%s' não encontrado."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "ramo '%s' não encontrado."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erro a eliminar o ramo remoto seguido '%s'"
+msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erro a eliminar ramo '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "Ramo remoto seguido %s eliminado (era %s).\n"
+msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ramo %s eliminado (era %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: desaparecido]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: atrás %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[atrás %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: à frente %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[à frente %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: à frente %d, atrás %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[à frente %d, atrás %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** referências inválida ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(nenhum ramo, a efetuar rebase de %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(nenhum ramo, bissecção iniciada em %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD destacada em %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD destacada de %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(nenhum ramo)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "O ramo %s está a ser rebaseado em %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "O ramo %s está a ser bissetado em %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr ""
"não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome de ramo inválido: '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Falha ao mudar o nome do ramo"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "O ramo incorretamente denominado '%s' mudou de nome"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "não foi possível escrever o modelo da descrição de ramo: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "não foi possível escrever o modelo da descrição do ramo"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Opções genéricas"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "apresentar hash e assunto, duplique para ramos a montante"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "suprimir mensagens informativas"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurar modo de seguimento (consulte git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "alterar a informação do ramo a montante"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "a montante"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "alterar a informação do ramo a montante"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "usar saída colorida"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
-msgstr "atuar sobre ramos remotos seguidos"
+msgstr "atuar sobre ramos de monitorização remotos"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "imprimir apenas ramos que contenham o commit"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Ações específicas do git-branch:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
-msgstr "listar ramos remotos seguidos e ramos locais"
+msgstr "listar ramos de monitorização remotos e ramos locais"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
-msgstr "eliminar um ramo totalmente incorporado"
+msgstr "eliminar um ramo totalmente integrado"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
-msgstr "eliminar um ramo (mesmo que não tenha sido incorporado)"
+msgstr "eliminar um ramo (mesmo que não tenha sido integrado)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "mover ou mudar o nome de um ramo e o seu reflog"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "listar os nomes dos ramos"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "criar reflog do ramo"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "editar a descrição do ramo"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "forçar criação, mover/mudar o nome ou exclusão"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
-msgstr "imprimir apenas os ramos que foram incorporados"
+msgstr "imprimir apenas os ramos que foram integrados"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
-msgstr "imprimir apenas os ramos que não foram incorporados"
+msgstr "imprimir apenas os ramos que não foram integrados"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "listar os ramos em colunas"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "chave"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "nome do campo pelo qual ordernar"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "imprimir apenas os ramos do objeto"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD não encontrada em refs/heads!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column e --verbose são incompatíveis"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "nome do ramo é obrigatório"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "Não é possível atribuir descrição a HEAD destacada"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "não é possível editar a descrição de mais do que um ramo"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Ainda não há commits no ramo '%s'."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Não há nenhum ramo denominado '%s'."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "demasiados ramos para uma operação de mudança de nome"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "demasiados ramos para definir novo ramo a montante"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3909,41 +4216,40 @@ msgstr ""
"não foi possível definir %s como ramo a montante de HEAD visto que esta não "
"aponta para um ramo."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "o ramo '%s' não existe"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "o ramo '%s' não existe"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "demasiados ramos para remover a definição de ramo a montante"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"não foi possível remover a definição de ramo a montante de HEAD visto que "
"esta não aponta para um ramo."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "O ramo '%s' não tem informação sobre o ramo a montante"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "não faz sentido criar 'HEAD' manualmente"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr ""
-"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
+msgstr "as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3952,7 +4258,7 @@ msgstr ""
"A opção --set-upstream é obsoleta e será removida. Considere o uso de --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3963,16 +4269,6 @@ msgstr ""
"Se quer que '%s' siga '%s', faça:\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -3991,8 +4287,8 @@ msgid ""
"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
"<type>|--textconv) <object>"
msgstr ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<tipo>|--textconv) <objeto>"
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-"
+"type]|-e|-p|<tipo>|--textconv) <objeto>"
#: builtin/cat-file.c:429
msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
@@ -4072,7 +4368,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -4164,8 +4460,9 @@ msgid "write the content to temporary files"
msgstr "escrever o conteúdo em ficheiros temporários"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "cadeia"
@@ -4213,82 +4510,82 @@ msgstr "caminho '%s': não é possível integrar"
#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "Não é possível integrar os resultados do merge de '%s'"
+msgstr "Não é possível adicionar os resultados da integração de '%s'"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' não pode ser usado com caminhos em atualização"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' não pode ser usado com %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo."
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "ficheiro de índice corrompido"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "o caminho '%s' não foi integrado"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Não é possível efetuar reflog de '%s': %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "não foi possível atualizar HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4309,7 +4606,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4336,166 +4633,166 @@ msgstr[1] ""
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda não criado"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "a referência não é uma árvore: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "não podem ser usados caminhos ao mudar de ramo"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' não pode ser usado ao mudar de ramo"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' não pode ser usado com '%s'"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "extrair a nossa versão dos ficheiros não integrados"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "extrair a versão deles dos ficheiros não integrados"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
-msgstr "realizar um merge com 3 pontos com o novo ramo"
+msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "não restringir especificadores de caminho a entradas esparsas"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"não verificar se outra árvore de trabalho contém a referência fornecida"
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forçar informação de progresso"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo "
-"tempo.\n"
-"Pretendia extrair '%s' podendo ser resolvido num commit?"
+"Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo."
+"\n"
+"Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4579,7 +4876,7 @@ msgstr "Introduza padrões a ignorar>> "
#: builtin/clean.c:690
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVISO: não foram encontrados itens correspondentes a %s"
+msgstr "AVISO: não foram encontrados itens correspondentes a: %s"
#: builtin/clean.c:711
msgid "Select items to delete"
@@ -4647,8 +4944,8 @@ msgstr "limpeza interativa"
msgid "remove whole directories"
msgstr "remover diretórios inteiros"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "padrão"
@@ -4674,7 +4971,7 @@ msgid ""
"clean"
msgstr ""
"clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
-"recusando-se a limpar"
+"limpeza recusada"
#: builtin/clean.c:904
msgid ""
@@ -4682,110 +4979,119 @@ msgid ""
"refusing to clean"
msgstr ""
"clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
-"recusando-se a limpar"
+"limpeza recusada"
#: builtin/clone.c:37
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opções>] [--] <repo> [<dir>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
-msgstr "não realizar extração"
+msgstr "não criar uma extração"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "criar um repositório espelhado (implica repositório nu)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "não usar ligações fixas, copiar sempre"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "número de submódulos clonados em paralelo"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "nome"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extrair <ramo> em vez da HEAD do remoto"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "caminho para git-upload-pack no remoto"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "criar um clone raso com essa profundidade"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "qualquer submódulo clonado será raso"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "separar o repositório git da árvore de trabalho"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "definir configuração dentro do novo repositório"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "usar apenas endereços IPv4"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4793,59 +5099,54 @@ msgstr ""
"Não foi possível adivinhar o nome do diretório.\n"
"Especifique um diretório na linha de comandos"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"ainda não é suportada a funcionalidade que permite ter o repositório de "
-"referência '%s' como uma extração ligada"
+"referência '%s' como uma extração ligada."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "o repositório de referência '%s' não é um repositório local."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "o repositório de referência '%s' é raso"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "o repositório de referência '%s' está enxertado"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "falha ao invocar stat de '%s'"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe e não é um diretório"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "falha ao invocar stat de %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4855,128 +5156,128 @@ msgstr ""
"Pode inspecionar o que foi extraído com 'git status'\n"
"e repetir a extração com 'git checkout -f HEAD'\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Ramo remoto %s não encontrado para clonar."
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "A verificar a conectividade... "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "o remoto não enviou todos os objetos necessários"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "não foi possível atualizar %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-"a HEAD remota referencia uma referência inexistente, não é possível "
-"extrair.\n"
+"a HEAD remota referencia uma referência inexistente, não é possível extrair."
+"\n"
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "não foi possível extrair a árvore de trabalho"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "não é possível reempacotar para limpar"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
-msgstr "não é possível invocar unlink sobre o ficheiro alternates temporário"
+msgstr "não é possível invocar unlink sobre o ficheiro sobressalente temporário"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "as opções --bare e --origin %s são incompatíveis."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare e --separate-git-dir são incompatíveis."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "o repositório '%s' não existe"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidade %s não é um número positivo"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
-#: builtin/clone.c:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "a árvore de trabalho '%s' já existe."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "não foi possível criar os diretórios superiores de '%s'"
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "A clonar no repositório nu '%s'...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "A clonar em '%s'...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth é ignorado em clones locais; use file:// ."
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local ignorado"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Não sei como clonar %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Parece foi clonado um repositório vazio."
@@ -5076,7 +5377,7 @@ msgid ""
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-"Pediu para emendar o commit mais recente, mas fazê-lo torná-lo-ia\n"
+"Pediu para emendar o commit mais recente, mas ao fazê-lo torná-lo-ia\n"
"vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n"
"commit completamente com \"git reset HEAD^\".\n"
@@ -5090,7 +5391,7 @@ msgid ""
msgstr ""
"O cherry-pick anterior está vazio, possivelmente devido a resolução de "
"conflitos.\n"
-"Se deseja fazer commit de qualquer forma, use:\n"
+"Se deseja submeter de qualquer forma, use:\n"
"\n"
" git commit --allow-empty\n"
"\n"
@@ -5115,66 +5416,66 @@ msgstr ""
"Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
"dos restantes commits.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "falha ao descompactar o objeto árvore HEAD"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "não foi possível criar índice temporário"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "falha ao adicionar interativamente"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "não é possível atualizar o índice temporário"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Falha ao atualizar a árvore de cache principal"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "não é possível escrever o ficheiro new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
-msgstr "não é possível fazer um commit parcial durante um merge."
+msgstr "não é possível fazer um commit parcial durante uma integração."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "não é possível fazer um commit parcial durante um cherry-pick."
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "não é possível ler o índice"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "não é possível escrever ficheiro de índice temporário"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "o commit '%s' não tem cabeçalho de autor"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "o commit '%s' tem a linha de autor malformada"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "parâmetro --author malformado"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "formato de data inválido: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5182,38 +5483,38 @@ msgstr ""
"não foi possível selecionar um carácter de comentário que\n"
"não estivesse já a ser usado na mensagem de commit atual"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "não foi possível consultar o commit %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(a ler mensagem de log da entrada padrão)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "não foi possível ler o log da entrada padrão"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "não é possível ler o ficheiro de log '%s'"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "não foi possível ler MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "não foi possível ler SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "não foi possível ler MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "não foi possível escrever o modelo de commit"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5223,12 +5524,12 @@ msgid ""
"and try again.\n"
msgstr ""
"\n"
-"Parece que está a fazer commit de um merge.\n"
+"Parece que está a submeter uma integração.\n"
"Se não for o caso, remova o ficheiro\n"
"\t%s\n"
"e tente de novo.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5238,12 +5539,12 @@ msgid ""
"and try again.\n"
msgstr ""
"\n"
-"Parece que está a fazer commit de um cherry-pick.\n"
+"Parece que está a submeter um cherry-pick.\n"
"Se não é o caso, remova o ficheiro\n"
-" %s\n"
+"\t%s\n"
"e tente outra vez.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5253,7 +5554,7 @@ msgstr ""
"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5264,149 +5565,149 @@ msgstr ""
"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
"Uma mensagem vazia aborta o commit.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Não é possível ler o índice"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Erro ao construir árvores"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Indique a mensagem usando as opções -m ou -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor "
"existente"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de ficheiros não controlados '%s'"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long e -z são incompatíveis"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr "Não faz sentido usar --reset-author e --author ao mesmo tempo"
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Não há nada para emendar."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Merge em curso -- não é possível emendar."
+msgstr "Integração em curso -- não é possível emendar."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Cherry-pick em curso -- não é possível emendar."
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "As opções --squash e --fixup não podem ser usadas juntas"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Inteligente... a emendar o último commit com o índice sujo."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo de limpeza inválido %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
-msgstr "A especificação de caminhos com -a não faz sentido."
+msgstr "Indicar caminhos com -a não faz sentido."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "mostrar status de forma concisa"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "mostrar informação do ramo"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "saída inteligível por máquina"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "apresentar status em formato longo (predefinição)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "terminar entradas com NUL"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
"(Predefinição: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "mostrar ficheiros ignorados"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5414,200 +5715,199 @@ msgstr ""
"ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
"(Predefinição: all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "listar ficheiros não controlados em colunas"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "não foi possível consultar o commit recém-criado"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "não foi possível analisar o commit recém-criado"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "HEAD destacada"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (commit-raiz)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
-msgstr "suprimir o resumo depois de fazer commit com sucesso"
+msgstr "suprimir o resumo depois de submeter com sucesso"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "mostrar diff no modelo da mensagem de commit"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Opções de mensagem de commit"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "ler mensagem de um ficheiro"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "substituir autor do commit"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "data"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "substituir data do commit"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "mensagem"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "mensagem de commit"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "reutilizar e editar a mensagem de um commit especificado"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "reutilizar a mensagem de um commit especificado"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensagem com formato autosquash para corrigir o commit especificado"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-"usar mensagem com formato autosquash para esmagar o commit especificado"
+msgstr "usar mensagem com formato autosquash para esmagar o commit especificado"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "adicionar Signed-off-by:"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "usar ficheiro de modelo especificado"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "forçar edição do commit"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "predefinição"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "como retirar espaços e #comentários da mensagem"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "incluir status no modelo da mensagem de commit"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Opções de conteúdo do commit"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
-msgstr "fazer commit de todos os ficheiros alterados"
+msgstr "submeter todos os ficheiros alterados"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
-msgstr "adicionar ficheiros especificados ao índice para incluir no commit"
+msgstr "adicionar ficheiros especificados ao índice para submeter"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "adicionar ficheiros interativamente"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "adicionar alterações interativamente"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
-msgstr "fazer commit somente dos ficheiros especificados"
+msgstr "submeter somente os ficheiros especificados"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "ignorar pre-commit hook"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
-msgstr "mostrar o que será incluído no commit"
+msgstr "mostrar o que seria submetido"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "emendar o commit anterior"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "ignorar post-rewrite hook"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "aceitar o registo duma alteração vazia"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "não foi possível analisar o commit HEAD"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD corrompido (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "não foi possível ler MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "não foi possível ler a mensagem de commit: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "A abortar o commit; não editou a mensagem.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5716,7 +6016,7 @@ msgstr "Tipo"
#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
-msgstr "o valor é \"true\" (verdadeiro) ou \"falso\" (falso)"
+msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)"
#: builtin/config.c:79
msgid "value is decimal number"
@@ -5756,7 +6056,7 @@ msgstr ""
msgid "unable to parse default color value"
msgstr "não é possível analisar o valor de cor por omissão"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5771,7 +6071,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "não é possível criar o ficheiro de configuração %s"
@@ -5786,7 +6086,7 @@ msgstr "imprimir dimensões em formato inteligível por humanos"
#: builtin/describe.c:17
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<opções>] [<commit-ish>...]"
+msgstr "git describe [<opções>] [<commit-etc>...]"
#: builtin/describe.c:18
msgid "git describe [<options>] --dirty"
@@ -5807,7 +6107,7 @@ msgstr "a tag anotada %s não tem nenhum nome incorporado"
msgid "tag '%s' is really '%s' here"
msgstr "a tag '%s' está de facto em '%s'"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "%s não é um nome de objeto válido"
@@ -5900,7 +6200,7 @@ msgstr "considerar as <n> tags mais recentes (predefinição: 10)"
msgid "only consider tags matching <pattern>"
msgstr "apenas considerar tags que correspondam ao <padrão>"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "mostrar objetos de commit abreviados em recurso"
@@ -5936,21 +6236,21 @@ msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica"
msgid "invalid option: %s"
msgstr "opção inválida: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Não é um repositório git"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto inválido '%s' fornecido."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mais do que dois blobs fornecidos: '%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto sem tratamento '%s' fornecido."
@@ -6009,8 +6309,7 @@ msgstr "anonimizar saída"
#: builtin/fetch.c:20
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
#: builtin/fetch.c:21
msgid "git fetch [<options>] <group>"
@@ -6024,19 +6323,19 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opções>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "obter de todos os remotos"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "caminho para o comando upload pack no remoto"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "forçar a substituição do ramo local"
@@ -6044,7 +6343,7 @@ msgstr "forçar a substituição do ramo local"
msgid "fetch from multiple remotes"
msgstr "obter de múltiplos remotos"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "obter todas as tags e objetos associados"
@@ -6056,19 +6355,19 @@ msgstr "não obter todas as tags (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos obtidos em paralelo"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
-msgstr "eliminar os ramos cujo respetivo ramo remoto já não existe"
+msgstr "eliminar os ramos de monitorização remotos que já não existem no remoto"
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "controlar a obtenção recursiva de submódulos"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "manter o pacote transferido"
@@ -6076,15 +6375,15 @@ msgstr "manter o pacote transferido"
msgid "allow updating of HEAD ref"
msgstr "permitir a atualização da referência HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "aprofundar o histórico de um clone raso"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "converter num repositório completo"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "dir"
@@ -6096,15 +6395,15 @@ msgstr "preceder isto ao caminho do submódulo"
msgid "default mode for recursion"
msgstr "modo recursivo por omissão"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "aceitar referência que atualizem .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "mapa de referências"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "especificar mapa de referências"
@@ -6162,11 +6461,6 @@ msgstr "atualização forçada"
msgid "(non-fast-forward)"
msgstr "(sem avanço rápido)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "não é possível abrir %s: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6212,7 +6506,7 @@ msgstr "(nenhum)"
#: builtin/fetch.c:841
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Não é possível obter objetos no ramo atual %s de um repositório não nu"
+msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
#: builtin/fetch.c:860
#, c-format
@@ -6352,11 +6646,11 @@ msgstr "imprimir apenas referências que apontem para o objeto fornecido"
#: builtin/for-each-ref.c:43
msgid "print only refs that are merged"
-msgstr "imprimir apenas referenciadas incorporadas"
+msgstr "imprimir apenas referenciadas integradas"
#: builtin/for-each-ref.c:44
msgid "print only refs that are not merged"
-msgstr "imprimir apenas referências não incorporadas"
+msgstr "imprimir apenas referências não integrada"
#: builtin/for-each-ref.c:45
msgid "print only refs which contain the commit"
@@ -6370,55 +6664,55 @@ msgstr "A verificar conectividade"
msgid "Checking object directories"
msgstr "A verificar diretórios de objetos"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opções>] [<objeto>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "mostrar objetos inalcançáveis"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "mostrar objetos suspensos"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "mostrar tags"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "mostrar nós raiz"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "considerar objetos do índice como nós cabeça"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "considerar os reflogs como nós cabeça (predefinição)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
-msgstr "considerar também pacotes e objetos alternate"
+msgstr "considerar também pacotes e objetos sobressalente"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "verificar só a conetividade"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "ativar verificação mais rigorosa"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "escrever objetos suspensos em .git/lost-found"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "mostrar progresso"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "A verificar objetos"
@@ -6446,7 +6740,7 @@ msgid ""
"%s"
msgstr ""
"A última execução do gc reportou o seguinte.\n"
-"Corrija a raiz do problema e remova %s.\n"
+"Corrija a origem do problema e remova %s.\n"
"A limpeza automática não será realizada enquanto o ficheiro existir.\n"
"\n"
"%s"
@@ -6523,229 +6817,229 @@ msgstr "não foi possível ler a árvore (%s)"
msgid "unable to grep from object of type %s"
msgstr "não foi possível efetuar grep de objetos do tipo %s"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "a opção '%c' espera um valor numérico"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "não é possível abrir '%s'"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "procurar no índice em vez de procurar na árvore de trabalho"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "procurar em conteúdos não geridos pelo git"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros controlados e não controlados"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "mostrar linhas não correspondidas"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "não diferenciar maiúsculas de minúsculas"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expressões regulares básicas do POSIX (predefinição)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "não mostrar nomes de ficheiro"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "mostrar apenas nomes de ficheiro sem correspondência"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "mostrar o número de correspondências em vez das linha correspondidas"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr ""
"imprimir uma linha em branco entre correspondências de diferentes ficheiros"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
"mesmo ficheiro"
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "mostrar uma linha com o nome da função antes das correspondências"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "indicar padrão encontrado no valor de saída, mas não imprimir"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar apenas correspondências de ficheiro que tenham todos os padrões"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "mostrar árvore de analise da expressões grep"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "nenhum padrão fornecido."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número de threads especificado inválido (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager só funciona na árvore de trabalho"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked não podem ser usados com --no-index."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index ou --untracked não podem ser usados em revisões."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard não podem ser usados em conteúdos não controlados."
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
-msgstr "--cached e árvores fornecidos simultaneamente."
+msgstr "--cached e árvores foram fornecidos simultaneamente."
#: builtin/hash-object.c:81
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
-"stdin] [--] <ficheiro>..."
+"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin]"
+" [--] <ficheiro>..."
#: builtin/hash-object.c:82
msgid "git hash-object --stdin-paths"
@@ -6826,8 +7120,8 @@ msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "falha ao executar '%s': %s"
+msgid "failed to exec '%s'"
+msgstr "falha ao executar '%s'"
#: builtin/help.c:205
#, c-format
@@ -6836,7 +7130,7 @@ msgid ""
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"'%s': caminho para visualizador de manual não suportado.\n"
-"Considere usar 'man.<tool>.cmd'."
+"Considere usar 'man.<ferramenta>.cmd'."
#: builtin/help.c:217
#, c-format
@@ -6845,12 +7139,12 @@ msgid ""
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"'%s': comando de visualizador de manual suportado.\n"
-"Considere usar 'man.<tool>.path'."
+"Considere usar 'man.<ferramenta>.path'."
#: builtin/help.c:334
#, c-format
msgid "'%s': unknown man viewer."
-msgstr "'%s' visualizador de manual desconhecido."
+msgstr "'%s': visualizador de manual desconhecido."
#: builtin/help.c:351
msgid "no man viewer handled the request"
@@ -6910,7 +7204,7 @@ msgstr "'git %s' é um alias de '%s'"
#: builtin/index-pack.c:152
#, c-format
msgid "unable to open %s"
-msgstr "não foi possível ler %s"
+msgstr "não foi possível abrir %s"
#: builtin/index-pack.c:202
#, c-format
@@ -6984,9 +7278,8 @@ msgid "offset value overflow for delta base object"
msgstr "delta de objeto base com capacidade excedida no valor de offset"
#: builtin/index-pack.c:530
-#, fuzzy
msgid "delta base offset is out of bound"
-msgstr "um offset de base delta ultrapassou o limite"
+msgstr "offset da base delta está fora do limite"
#: builtin/index-pack.c:538
#, c-format
@@ -7087,107 +7380,109 @@ msgstr "extrema confusão"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "concluído com %d objetos locais"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "concluído com %d objeto local"
+msgstr[1] "concluído com %d objetos locais"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pacote com %d delta não resolvido"
msgstr[1] "pacote com %d deltas não resolvidos"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "não é possível compactar objeto acrescentado (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s corrompido"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "não é possível escrever o ficheiro de conservação '%s'"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "não é possível guardar ficheiro de pacote"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "não é possível guardar o ficheiro índice"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorreto"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "sem suporte de threads, %s ignorado"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Não é possível abrir o ficheiro de pacote '%s' existente"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'"
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d objeto não delta"
msgstr[1] "%d objetos não delta"
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "comprimento de cadeia = %d: %lu objeto"
msgstr[1] "comprimento de cadeia = %d: %lu objetos"
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "Não é possível voltar ao diretório de trabalho atual"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "%s incorreto"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin não pode ser usado sem --stdin"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify sem nome do ficheiro de pacote indicado"
@@ -7226,28 +7521,27 @@ msgstr "não é possível copiar '%s' para '%s'"
msgid "ignoring template %s"
msgstr "modelo %s ignorado"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "modelos não encontrados em %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr ""
-"os modelos com versão de formato %d incorreta não foram copiados de '%s'"
+msgid "not copying templates from '%s': %s"
+msgstr "modelos não copiados de '%s': %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s já existe"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "não foi possível processar o tipo de ficheiro %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "não foi possível mover %s para %s"
@@ -7255,51 +7549,51 @@ msgstr "não foi possível mover %s para %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "Repositório Git %s%s em %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "existente reinicializado"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "vazio inicializado"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " partilhado"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
-"shared[=<permissões>]] [<diretório>]"
+"git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] "
+"[--shared[=<permissões>]] [<diretório>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "permissões"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
"especificar que o repositório git será partilhado por vários utilizadores"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "não é possível criar o diretório %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "não é possível mudar para o diretório %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7308,7 +7602,7 @@ msgstr ""
"%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-"
"dir=<diretório>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Não é possível aceder à árvore de trabalho '%s'"
@@ -7354,267 +7648,319 @@ msgstr "git show [<opções>] <objeto>..."
msgid "invalid --decorate option: %s"
msgstr "opção --decorate inválida: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "suprimir saída do diff"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr "processar intervalo de linhas n,m, a cantar a partir de 1"
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Resultado final: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ficheiro incorreto"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Não foi possível ler o objeto %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "o nome do diretório de saída é demasiado longo"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Não é possível abrir o ficheiro de patch %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Não é um intervalo."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Dois diretórios de saída?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit desconhecido %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falha ao resolver '%s' numa referência válida."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Não foi possível encontrar a base exata de integração."
+
+#: builtin/log.c:1235
+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 ""
+"Falha ao obter ramo a montante, se quer gravar o commit base automaticamente,"
+"\n"
+"use branch --set-upstream-to para seguir um ramo remoto.\n"
+"Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Falha ao procurar base exata de integração"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "o commit base deve ser o antecessor da lista de revisões"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "o commit base não deve fazer parte da lista de revisões"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "não é possível obter o id do patch"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "usar [PATCH n/m] mesmo com um único patch"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr ""
"usar uma sequência de números simples para denominar os ficheiros gerados"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "começar a numerar os patches em <n> em vez de 1"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "marcar a série como a n-ésima reiteração"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "não tirar/inserir [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "não gerar diffs binários"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "preencher o cabeçalho From com hash de zeros"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "não incluir um patch que coincida com um commit a montante"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"definir o endereço From como <identidade> (ou como identidade do committer "
"se não indicado)"
-#: builtin/log.c:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "usar o primeiro email para responder a <id-mensagem>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "commit-base"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "adicionar informação pré-requisito da árvore à série de patches"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "não imprimir os nomes dos ficheiros de patch"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n e -k são mutuamente exclusivos."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix e -k são mutuamente exclusivos."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only não faz sentido"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status não faz sentido"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check não faz sentido"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "saída padrão, ou diretório, qual deles?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Não foi possível criar o diretório '%s'"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "não é possível ler o ficheiro de assinatura '%s'"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7622,11 +7968,6 @@ msgstr ""
"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
"manualmente.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Commit desconhecido %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opções>] [<ficheiro>...]"
@@ -7643,7 +7984,7 @@ msgstr ""
#: builtin/ls-files.c:431
msgid "show cached files in the output (default)"
-msgstr "mostrar ficheiros em cache na saída"
+msgstr "mostrar ficheiros em cache na saída (predefinição)"
#: builtin/ls-files.c:433
msgid "show deleted files in the output"
@@ -7684,11 +8025,11 @@ msgstr "não mostrar diretórios vazios"
#: builtin/ls-files.c:453
msgid "show unmerged files in the output"
-msgstr "mostrar ficheiros com versões não conciliadas, na saída"
+msgstr "mostrar ficheiros não integrados na saída"
#: builtin/ls-files.c:455
msgid "show resolve-undo information"
-msgstr "mostrar informação de resolver-anular"
+msgstr "mostrar informação de resolver-desfazer"
#: builtin/ls-files.c:457
msgid "skip files matching pattern"
@@ -7716,11 +8057,12 @@ msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
#: builtin/ls-files.c:472
msgid "tree-ish"
-msgstr "árvore"
+msgstr "árvore-etc"
#: builtin/ls-files.c:473
msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "fingir que os caminhos removidos desde <árvore> ainda estão presentes"
+msgstr ""
+"fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
#: builtin/ls-files.c:475
msgid "show debugging data"
@@ -7774,7 +8116,7 @@ msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opções>] <árvore> [<caminho>...]"
+msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
@@ -7821,172 +8163,178 @@ msgstr "git merge [<opções>] <msg> HEAD <commit>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "a opção 'm' requer um valor"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
-msgstr "Estratégia de merge '%s' não encontrada.\n"
+msgstr "Estratégia de integração '%s' não encontrada.\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Estratégias disponíveis:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "Estratégias personalizadas disponíveis:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
-msgstr "não apresentar um diffstat no final do merge"
+msgstr "não apresentar um diffstat ao fim da integração"
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
-msgstr "mostrar um diffstat no final do merge"
+msgstr "mostrar um diffstat ao fim da integração"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(sinónimo de --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit do merge"
+"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
+"integração"
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
-msgstr "criar um único commit em vez de realizar um merge"
+msgstr "criar um único commit em vez de realizar uma integração"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
-msgstr "realizar um commit se o merge for bem sucedido (predefinição)"
+msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
-msgstr "editar a mensagem antes de realizar commit"
+msgstr "editar a mensagem antes de submeter"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "permitir avanço rápido (predefinição)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "abortar se não é possível efetuar avanço rápido"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "estratégia"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
-msgstr "estratégia de merge a usar"
+msgstr "estratégia de integração a usar"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "opção=valor"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
-msgstr "opções para a estratégia de merge selecionada"
+msgstr "opções da estratégia de integração selecionada"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "mensagem de commit (de merge não suscetível a avanço rápido)"
+msgstr "mensagem de commit (de integração não suscetível a avanço rápido)"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
-msgstr "abortar merge em curso"
+msgstr "abortar integração em curso"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "permitir integração de históricos não relacionados"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "não foi possível executar o comando stash."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "falha ao executar o comando stash"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "nome de objeto inválido: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "falha ao executar o comando read-tree"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (não há nada para esmagar)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit esmagado -- HEAD não atualizada\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Não foi possível escrever em '%s'"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "A escrever SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "A concluir SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
-msgstr "Sem mensagem de merge -- HEAD não atualizada\n"
+msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' não aponta para um commit"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
-msgstr "A processar exclusivamente merge de duas cabeças."
+msgstr "Não se processa outra coisa senão incorporação de duas cabeças."
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opção desconhecida de merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "não foi possível escrever %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "Não foi possível ler '%s'"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-"Commit do merge não realizado; use 'git commit' para concluir o merge.\n"
+"Commit de integração não realizado; use 'git commit' para concluir a "
+"integração.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7995,180 +8343,184 @@ msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-"Introduza uma mensagem de commit, explicando por que este merge é "
+"Introduza uma mensagem de commit, explicando por que esta integração é "
"necessário,\n"
-"sobretudo se incorpora um ramo a montante atualizado, com um ramo tópico.\n"
+"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n"
"\n"
-"Linhas começadas com '%c' são ignoradas, e uma mensagem vazia\n"
+"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n"
"aborta o commit.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Mensagem de commit vazia."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilhoso.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-"Falha ao realizar merge automático; corrija os conflitos e faça commit do "
+"Falha ao realizar integração automática; corrija os conflitos e submeta o "
"resultado.\n"
-#: builtin/merge.c:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' não é um commit"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "Não há um remoto para o ramo atual."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "Não está definido nenhum ramo a montante para o ramo atual."
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
-msgstr "Nenhum ramo remoto seguido por %s de %s"
+msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "não foi possível fechar '%s'"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Não há nenhum merge para abortar (MERGE_HEAD não presente)."
+msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)."
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"Merge não concluído (MERGE_HEAD presente).\n"
-"Faça commit das suas alterações antes de realizar merge."
+"Não concluiu a integração (MERGE_HEAD presente).\n"
+"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
-"Faça commit das suas alterações antes de realizar merge."
+"Submeta as suas alterações antes de integrar."
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "Não é possível combinar --squash e --no-ff."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-"Não faz sentido efetuar commit não suscetível a avanço rápido, numa cabeça "
+"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça "
"vazia"
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
-msgstr "%s - não é algo suscetível a merge"
+msgstr "%s - não é algo se possa integrar"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
-msgstr "Só é possível realizar merge de exatamente um commit numa cabeça vazia"
+msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, não é de "
"confiança."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "O commit %s não tem uma assinatura GPG."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "A assinatura GPG do commit %s por %s está correta\n"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "integração de históricos não relacionados recusada"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "A atualizar %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
-msgstr "A tentar merge mesmo trivial no interior do índice...\n"
+msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Não.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "Não é possível avançar rapidamente, a abortar."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "A recuar a árvore ao seu estado original...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
-msgstr "A tentar a estratégia de merge %s...\n"
+msgstr "A tentar a estratégia de integração %s...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
-msgstr "Nenhuma estratégia de merge conseguiu processar o merge.\n"
+msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
-msgstr "Falha ao realizar merge com a estratégia %s.\n"
+msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-"O merge automático foi bem sucedido; interrompido antes de realizar commit "
-"como pretendido\n"
+"A integração automática foi bem sucedida; interrompida antes de submeter "
+"como solicitado\n"
#: builtin/merge-base.c:29
msgid "git merge-base [-a | --all] <commit> <commit>..."
@@ -8196,7 +8548,7 @@ msgstr "mostrar todos os antecessores"
#: builtin/merge-base.c:216
msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de um único merge com n pontos"
+msgstr "encontrar antecessores de uma única integração com n pontos"
#: builtin/merge-base.c:218
msgid "list revs not reachable from others"
@@ -8209,7 +8561,7 @@ msgstr "o primeiro é antecessor do segundo?"
#: builtin/merge-base.c:222
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-"descobrir aonde foi que o <commit> divergiu usando o reflog da <referência>"
+"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>"
#: builtin/merge-file.c:8
msgid ""
@@ -8225,7 +8577,7 @@ msgstr "enviar resultados para a saída padrão"
#: builtin/merge-file.c:34
msgid "use a diff3 based merge"
-msgstr "usar merge baseado em diff3"
+msgstr "usar integração baseada em diff3"
#: builtin/merge-file.c:35
msgid "for conflicts, use our version"
@@ -8274,12 +8626,12 @@ msgstr "git mv [<opções>] <origem>... <destino>"
#: builtin/mv.c:70
#, fuzzy, c-format
msgid "Directory %s is in index and no submodule?"
-msgstr "O diretório %s está no índice mas não no submódulo?"
+msgstr "O diretório %s está no índice mas não em nenhum submódulo?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
+"Prepare as suas alterações em .gitmodules ou empilhe-as (stash) para "
"prosseguir"
#: builtin/mv.c:90
@@ -8356,48 +8708,48 @@ msgstr "%s, origem=%s, destino=%s"
msgid "Renaming %s to %s\n"
msgstr "A mudar de nome de %s para %s\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "falha ao mudar o nome de '%s'"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opções>] <commit>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opções>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opções>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "imprimir apenas nomes (sem SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "usar apenas tags para designar commits"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "usar apenas referência que correspondam ao <padrão>"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "listar todos os commits alcançáveis a partir de todas as referências"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "ler da entrada padrão"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "desreferenciar tags na entrada (uso interno)"
@@ -8505,7 +8857,7 @@ msgstr "git notes remove [<objeto>]"
#: builtin/notes.c:84
msgid "git notes prune [<options>]"
-msgstr "git notes prune [<optções>]"
+msgstr "git notes prune [<opções>]"
#: builtin/notes.c:89
msgid "git notes get-ref"
@@ -8543,24 +8895,16 @@ msgstr "não é possível escrever o objeto de nota"
msgid "The note contents have been left in %s"
msgstr "O conteúdo da nota foi guardado em %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "não é possível ler '%s'"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "não foi possível abrir ou ler '%s'"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Falha ao resolver '%s' numa referência válida."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8573,7 +8917,7 @@ msgstr "Não é possível ler os dados da nota de um objeto não-blob '%s'."
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "demasiados parâmetros"
@@ -8620,7 +8964,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "A substituir as notas existentes do objeto %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "A remover a nota do objeto %s\n"
@@ -8660,65 +9004,65 @@ msgstr ""
"As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
"Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Opções gerais"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
-msgstr "Opções de merge"
+msgstr "Opções de integração"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-"resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
-"theirs/union/cat_sort_uniq)"
+"resolver conflitos nas notas usando a estratégia indicada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
-msgstr "Efetuar commit de notas não integradas"
+msgstr "A submeter notas não integradas"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
-msgstr "concluir merge de notas, fazendo commit de notas não integradas"
+msgstr "concluir integração de notas, submetendo notas não integradas"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
-msgstr "Abortar resoluções de merge das notas"
+msgstr "A abortar resolução de integração das notas"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
-msgstr "abortar merge das notas"
+msgstr "abortar integração das notas"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
-msgstr "Merge das notas em %s já está em curso em %s"
+msgstr "Uma integração das notas em %s já está em curso em %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "O objeto %s não tem nenhuma nota\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "não considerar como erro a remoção de uma nota não existente"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "ler nome dos objetos da entrada padrão"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "usar notas de <notes-ref>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subcomando desconhecido: %s"
@@ -8742,171 +9086,177 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "erro ao compactar (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"a desativar escrita de mapa de bits, os pacotes são divididos devido a "
+"pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr "A escrever objetos"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
"ser compactados"
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "A comprimir objetos"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "versão de índice %s não suportada"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "não mostrar medidor de progresso"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "mostrar medidor de progresso"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "versão[,offset]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escrever o ficheiro de índice do pacote na versão de formato especificada"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "tamanho máximo de cada ficheiro de pacote gerado"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
-msgstr "ignorar objetos emprestados do arquivo de objetos alternate"
+msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "limitar a janela de compactação por objetos"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limitar a janela de compactação por memória em adição ao limite por objetos"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "reutilizar deltas existentes"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr "usar threads ao procurar pela melhor correspondência delta"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "não criar um pacote vazio"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "ler argumentos de revisão da entrada padrão"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "restringir-se aos objetos que ainda não foram compactados"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcançáveis a partir de qualquer referência"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referenciados por entradas do reflog"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "gerar pacote para a saída padrão"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refiram objetos a compactar"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "manter objetos inalcançáveis"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "descompactar objetos inalcançáveis mais recentes que <hora>"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "criar pacotes finos"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "ignorar pacotes que tenham um ficheiro .keep"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "nível de compactação do pacote"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "não esconder commits introduzidos por enxertos"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar um índice de mapa de bits se disponível, para acelerar a contagem de "
"objetos"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "A contar objetos"
@@ -8934,15 +9284,15 @@ msgstr "A remover objetos duplicados"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<head>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "não remover, mostrar apenas"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "apresentar objetos eliminados"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "expirar objetos mais antigos que <hora>"
@@ -8954,50 +9304,53 @@ msgstr "não é possível limpar num repositório de objetos-preciosos"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
-msgstr "Opções relacionadas com merge"
+msgstr "Opções relativas a integração"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
-msgstr "incorporar alterações por rebase em vez de merge"
+msgstr "incorporar alterações por rebase em vez de integrar"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "permitir avanço rápido"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar se o commit tem uma assinatura GPG válida"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Opções relacionadas com obtenção de objetos"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
-msgstr "número de submódulos obtidos em paralelo"
+msgstr "número de submódulos puxados em paralelo"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido de pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Não é possível efetuar pull com rebase: tem alterações não preparadas."
+msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
-msgstr "Além disso, o índice contém alterações pendentes para commit."
+msgstr "Além disso, o índice contém alterações não submetidas."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-"Não é possível efetuar pull com rebase: o índice contém alterações pendentes "
-"para commit."
+"Não é possível puxar com rebase: o índice contém alterações não submetidas."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -9005,14 +9358,14 @@ msgstr ""
"Não há nenhum candidato com o qual realizar rebase de entre as referências "
"que se acabaram de obter."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-"Não há nenhum candidato com o qual realizar merge de entre as referências "
-"que se acabaram obter."
+"Não há nenhum candidato com o qual integrar de entre as referências que se "
+"acabaram obter."
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -9020,64 +9373,74 @@ msgstr ""
"Geralmente, significa que forneceu um especificador de referência\n"
"com um carácter universal (wildcard) que não corresponde a nenhum remoto."
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, 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 ""
-"Solicitou pull do remoto '%s', mas não especificou um ramo.\n"
-"Uma vez que este não é o remoto configurado por omissão,\n"
-"deve especificar um ramo na linha de comandos."
+"Solicitou puxar o remoto '%s', mas não especificou um ramo.\n"
+"Uma vez que este não é o remoto configurado por predefinição\n"
+"do ramo atual, deve especificar um ramo na linha de comandos."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Não se encontra em nenhum ramo de momento."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
-msgstr "Especifique o ramo com o qual pretende realizar merge."
+msgstr "Especifique o ramo com o qual pretende integrar."
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Consulte git-pull(1) para obter mais detalhes."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remoto>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ramo>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "O ramo atual não segue nenhum ramo."
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-"Se deseja definir um ramo para este ramo seguir, pode fazê-lo com:\n"
-"\n"
-" git branch --set-upstream-to=%s/<ramo> %s\n"
+"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
+"com:"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-"A configuração indica para efetuar merge com a referência '%s'\n"
-"do remoto, mas esta ainda não foi obtida."
+"A configuração indica para integrar com a referência '%s'\n"
+"do remoto, mas aquela referência não foi obtida."
+
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "a opção --[no-]autostash só é válida com --rebase."
-#: builtin/pull.c:841
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
"índice."
-#: builtin/pull.c:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9088,7 +9451,7 @@ msgstr ""
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9105,11 +9468,11 @@ msgstr ""
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
-msgstr "Não é possível efetuar merge de múltiplos ramos numa cabeça vazia."
+msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
@@ -9189,8 +9552,7 @@ msgstr ""
#: builtin/push.c:183
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr ""
-"O ramo atual %s tem múltiplos ramos a montante, recusando-se a publicar."
+msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada."
#: builtin/push.c:186
#, c-format
@@ -9403,10 +9765,10 @@ msgid ""
"[-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=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore1> [<árvore2> "
-"[<árvore3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>)"
+" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
+"[--index-output=<ficheiro>] (--empty | <árvore-etc1> [<árvore-etc2> [<árvore-"
+"etc3>]])"
#: builtin/read-tree.c:110
msgid "write resulting index to <file>"
@@ -9418,21 +9780,21 @@ msgstr "apenas esvaziar o índice"
#: builtin/read-tree.c:115
msgid "Merging"
-msgstr "A realizar merge"
+msgstr "A integrar"
#: builtin/read-tree.c:117
msgid "perform a merge in addition to a read"
-msgstr "realizar um merge em adição a uma leitura"
+msgstr "realizar uma integração em adição a uma leitura"
#: builtin/read-tree.c:119
msgid "3-way merge if no file level merging required"
msgstr ""
-"realizar merge com 3 pontos se o merge ao nível dos ficheiros não for "
-"necessário"
+"integrar com 3 pontos se a integração ao nível de ficheiros não for "
+"necessária"
#: builtin/read-tree.c:121
msgid "3-way merge in presence of adds and removes"
-msgstr "realizar merge com 3 ponto na presença de adições e remoções"
+msgstr "integrar com 3 ponto na presença de adições e remoções"
#: builtin/read-tree.c:123
msgid "same as -m, but discard unmerged entries"
@@ -9448,7 +9810,7 @@ msgstr "ler a árvore em <subdiretório>/ para o índice"
#: builtin/read-tree.c:128
msgid "update working tree with merge result"
-msgstr "atualizar a árvore de trabalho com os resultados do merge"
+msgstr "atualizar a árvore de trabalho com os resultados da integração"
#: builtin/read-tree.c:130
msgid "gitignore"
@@ -9460,7 +9822,7 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
#: builtin/read-tree.c:134
msgid "don't check the working tree after merging"
-msgstr "não verificar a árvore de trabalho depois de efetuar merge"
+msgstr "não verificar a árvore de trabalho depois de integrar"
#: builtin/read-tree.c:135
msgid "don't update the index or the work tree"
@@ -9474,6 +9836,18 @@ msgstr "ignorar a aplicação do filtro de extração esparsa"
msgid "debug unpack-trees"
msgstr "depurar unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "silencioso"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Deve especificar um diretório."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9493,8 +9867,8 @@ msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <ramo>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nome> <url>"
+"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <nome> <url>"
#: builtin/remote.c:14 builtin/remote.c:34
msgid "git remote rename <old> <new>"
@@ -9733,7 +10107,7 @@ msgstr "realiza rebase interativo sobre %s do remoto"
#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
-msgstr " realiza merge com %s do remoto"
+msgstr " integra com %s do remoto"
#: builtin/remote.c:972
msgid " and with remote"
@@ -9742,7 +10116,7 @@ msgstr " e com o remoto"
#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
-msgstr "realiza merge com %s do remoto"
+msgstr "integra com %s do remoto"
#: builtin/remote.c:975
msgid " and with remote"
@@ -9802,176 +10176,178 @@ msgstr "* remoto %s"
msgid " Fetch URL: %s"
msgstr " Obter do URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(nenhum URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " Publicar no URL: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " Ramo HEAD: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Ramo remoto:%s"
msgstr[1] " Ramos remotos:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (estado não consultado)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ramo local configurado para 'git pull':"
msgstr[1] " Ramos locais configurados para 'git pull':"
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " Referências locais serão refletidas (mirror) por 'git push'"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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 para 'git push'%s:"
msgstr[1] " Referências locais configuradas para 'git push'%s:"
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Não é possível determinar o remoto HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Não foi possível eliminar %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Referência inválida: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Não foi possível configurar %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "A eliminar %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [eliminaria] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminado] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "eliminar remotos depois de obter"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Remoto inexistente '%s'"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "nenhum remoto especificado"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "o remoto '%s' não tem nenhum URL configurado"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "manipular URLs de publicação"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete não faz sentido"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "URL não encontrado: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Não é possível remover todos os URLs de não publicação"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "ser verboso; deve ser colocado antes de um subcomando"
@@ -10087,7 +10463,7 @@ msgstr "mergetag incorreta no commit '%s'"
#: builtin/replace.c:357
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "mergetag malformada no commit '%s' "
+msgstr "mergetag malformada no commit '%s'"
#: builtin/replace.c:368
#, c-format
@@ -10105,12 +10481,12 @@ msgstr "o commit original '%s' tem uma assinatura gpg."
#: builtin/replace.c:402
msgid "the signature will be removed in the replacement commit!"
-msgstr "a assinatura será removida do commit substituto!"
+msgstr "a assinatura será removida do commit suplente!"
#: builtin/replace.c:408
#, c-format
msgid "could not write replacement commit for: '%s'"
-msgstr "não foi possível escrever o commit substituto de: '%s'"
+msgstr "não foi possível escrever o commit suplente de: '%s'"
#: builtin/replace.c:432
msgid "list replace refs"
@@ -10157,11 +10533,11 @@ msgstr ""
#: builtin/reset.c:27
msgid "git reset [-q] <tree-ish> [--] <paths>..."
-msgstr "git reset [-q] <árvore> [--] <caminhos>..."
+msgstr "git reset [-q] <árvore-etc> [--] <caminhos>..."
#: builtin/reset.c:28
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<árvore>] [--] [<caminhos>...]"
+msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
#: builtin/reset.c:34
msgid "mixed"
@@ -10204,7 +10580,7 @@ msgstr "HEAD está agora em %s"
#: builtin/reset.c:183
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "Não é possível repor de modo %s durante um merge."
+msgstr "Não é possível repor de modo %s durante uma integração."
#: builtin/reset.c:276
msgid "be quiet, only report errors"
@@ -10286,7 +10662,7 @@ msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]"
#: builtin/rev-parse.c:363
msgid "keep the `--` passed as an arg"
-msgstr "Conservar '--' passado como argumento"
+msgstr "conservar '--' passado como argumento"
#: builtin/rev-parse.c:365
msgid "stop parsing after the first non-option argument"
@@ -10313,7 +10689,7 @@ msgstr ""
#: builtin/revert.c:22
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<opções>] <commit-ish>..."
+msgstr "git revert [<opções>] <commit-etc>..."
#: builtin/revert.c:23
msgid "git revert <subcommand>"
@@ -10321,7 +10697,7 @@ msgstr "git revert <subcommando>"
#: builtin/revert.c:28
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<opções>] <commit-ish>..."
+msgstr "git cherry-pick [<opções>] <commit-etc>..."
#: builtin/revert.c:29
msgid "git cherry-pick <subcommand>"
@@ -10346,7 +10722,7 @@ msgstr "cancelar reversão ou cherry-pick"
#: builtin/revert.c:83
msgid "don't automatically commit"
-msgstr "não efetuar commit automaticamente"
+msgstr "não submeter automaticamente"
#: builtin/revert.c:84
msgid "edit the commit message"
@@ -10358,7 +10734,7 @@ msgstr "número de pai"
#: builtin/revert.c:89
msgid "merge strategy"
-msgstr "estratégia de merge"
+msgstr "estratégia de integração"
#: builtin/revert.c:90
msgid "option"
@@ -10366,7 +10742,7 @@ msgstr "opção"
#: builtin/revert.c:91
msgid "option for merge strategy"
-msgstr "opção de estratégia de merge"
+msgstr "opção de estratégia de integração"
#: builtin/revert.c:104
msgid "append commit name"
@@ -10420,7 +10796,7 @@ msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"\n"
-"(use 'rm -rf' se quer mesmo removê-lo, incluindo todo o seu histórico)"
+"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
#: builtin/rm.c:230
msgid ""
@@ -10484,12 +10860,6 @@ msgstr "permitir remoção recursiva"
msgid "exit with a zero status even if nothing matched"
msgstr "sair com valor zero mesmo quando não há correspondência"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
-"prosseguir"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10531,8 +10901,7 @@ msgstr "imprimir estado do programa auxiliar remoto"
#: builtin/shortlog.c:13
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
-msgstr ""
-"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
#: builtin/shortlog.c:242
msgid "sort output according to the number of commits per author"
@@ -10572,11 +10941,11 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
#: builtin/show-branch.c:640
msgid "show remote-tracking and local branches"
-msgstr "mostrar os ramos remotos seguidos e os ramos locais"
+msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
#: builtin/show-branch.c:642
msgid "show remote-tracking branches"
-msgstr "mostrar os ramos remotos seguidos"
+msgstr "mostrar os ramos de monitorização remotos"
#: builtin/show-branch.c:644
msgid "color '*!+-' corresponding to the branch"
@@ -10604,7 +10973,7 @@ msgstr "designar commits pelos seus nomes de objeto"
#: builtin/show-branch.c:655
msgid "show possible merge bases"
-msgstr "mostrar possíveis bases de merge"
+msgstr "mostrar possíveis bases de integração"
#: builtin/show-branch.c:657
msgid "show refs unreachable from any other ref"
@@ -10620,7 +10989,7 @@ msgstr "mostrar apenas commits não presentes no primeiro ramo"
#: builtin/show-branch.c:664
msgid "show merges reachable from only one tip"
-msgstr "mostrar merges alcançáveis a partir duma única ponta"
+msgstr "mostrar integrações alcançáveis a partir duma única ponta"
#: builtin/show-branch.c:666
msgid "topologically sort, maintaining date order where possible"
@@ -10640,8 +11009,8 @@ 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] [--] [<padrão>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -10698,84 +11067,183 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Referência inexistente: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "não é possível tirar um componente do URL '%s'"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Suprimir a saída ao inicializar um submódulo"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<caminho>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
-"<repositório>] [--name <nome>] [--url <url>][--depth <profundidade>] [--] "
-"[<caminho>...]"
+"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "não foi possível criar o diretório '%s'"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "falha ao clonar '%s' no caminho do submódulo '%s'"
+msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "não é possível abrir o ficheiro '%s'"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "não é possível fechar o ficheiro %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
-msgstr "não foi possível obter o o diretório do submódulo de '%s'"
+msgstr "não foi possível obter o diretório do submódulo de '%s'"
+
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Caminho de submódulo '%s' não inicializado"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Pretendia usar 'update --init'?"
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "A ignorar submódulo %s não integrado"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "A ignorar submódulo '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "caminho para a árvore de trabalho"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-"fatal: o subcomando submodule--helper deve ser invocado com um subcomando"
+"caminho para a árvore de trabalho, atravessando limites de submódulos "
+"aninhados"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout ou none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "criar um clone raso, truncado ao número especificado de revisões"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "trabalhos em paralelo"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "não imprimir progresso da clonagem"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "valor incorreto no parâmetro update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
+
+#: builtin/submodule--helper.c:862
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "fatal: '%s' não é um subcomando de submodule--helper válido"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' não é um subcomando válido de submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10830,27 +11298,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <nome-da-tag>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "o nome da tag é demasiado longo: %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' não encontrada."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' eliminada (era %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "não foi possível validar a tag '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10863,7 +11326,7 @@ msgstr ""
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10960,11 +11423,11 @@ msgstr "imprimir apenas tags que contenham o commit"
#: builtin/tag.c:364
msgid "print only tags that are merged"
-msgstr "imprimir apenas as tags que foram incorporadas"
+msgstr "imprimir apenas as tags que foram integradas"
#: builtin/tag.c:365
msgid "print only tags that are not merged"
-msgstr "imprimir apenas as tags que não foram incorporadas"
+msgstr "imprimir apenas as tags que não foram integradas"
#: builtin/tag.c:370
msgid "print only tags of the object"
@@ -10994,21 +11457,21 @@ msgstr "as opções --merged e --no-merged só são permitidas com -l"
msgid "only one -F or -m option is allowed."
msgstr "só é permitido um opção -F ou -m."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "demasiado parâmetros"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' não é um nome de tag válido."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "a tag '%s' já existe"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' atualizada (era %s)\n"
@@ -11025,7 +11488,7 @@ msgstr "falha ao criar o diretório %s"
#: builtin/update-index.c:85
#, c-format
msgid "failed to stat %s"
-msgstr "falha ao efetuar stat de %s"
+msgstr "falha ao invocar stat de %s"
#: builtin/update-index.c:95
#, c-format
@@ -11040,7 +11503,7 @@ msgstr "falha ao eliminar o ficheiro %s"
#: builtin/update-index.c:110 builtin/update-index.c:212
#, c-format
msgid "failed to delete directory %s"
-msgstr "falha ao criar o diretório %s"
+msgstr "falha ao eliminar o diretório %s"
#: builtin/update-index.c:133
#, c-format
@@ -11109,7 +11572,7 @@ msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
#: builtin/update-index.c:942
msgid "refresh even if index contains unmerged entries"
-msgstr "refrescar mesmo que o índice contenha entradas não incorporadas"
+msgstr "refrescar mesmo que o índice contenha entradas não integradas"
#: builtin/update-index.c:945
msgid "refresh stat information"
@@ -11272,7 +11735,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..."
msgid "print commit contents"
msgstr "imprimir conteúdo do commit"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "imprimir informação do gpg em bruto"
@@ -11292,7 +11755,7 @@ msgstr "mostrar apenas estatísticas"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <tag>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "imprimir conteúdo da tag"
@@ -11308,71 +11771,75 @@ msgstr "git worktree prune [<opções>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opções>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "A remover worktrees/%s: diretório inválido"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "A remover worktrees/%s: o ficheiro gitdir não existe"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "A remover worktrees/%s: ficheiro gitdir inválido"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
"inexistente"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "falha ao remover: %s"
+msgid "failed to remove '%s'"
+msgstr "falha ao remover '%s'"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "'%s' já existe"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "não foi possível criar o diretório de '%s'"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "A preparar %s (identificador %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "criar um novo ramo"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "criar ou repor um ramo"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "povoar a nova árvore de trabalho"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B e --detach são mutuamente exclusivos"
@@ -11392,7 +11859,7 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>"
msgid "only useful for debugging"
msgstr "apenas útil para depuração"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimir mensagens de depuração no stderr"
@@ -11406,9 +11873,9 @@ msgstr ""
"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
"para ler sobre um subcomando ou conceito específico."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr ""
+msgstr "Não é suportado afixar chaves públicas com cURL < 7.44.0"
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
@@ -11473,7 +11940,7 @@ msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
#: common-cmds.h:27
msgid "Show commit logs"
-msgstr "Mostrado logs de commits"
+msgstr "Mostrar histórico de commits"
#: common-cmds.h:28
msgid "Join two or more development histories together"
@@ -11535,7 +12002,7 @@ msgstr "ser mais silencioso"
msgid "use <n> digits to display SHA-1s"
msgstr "usar <n> dígitos para mostrar SHA-1s"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr ""
"atualizar o índice com resoluções de conflitos reutilizadas se possível"
@@ -11569,12 +12036,11 @@ msgstr "HEAD incorreta - é necessário uma HEAD"
#, sh-format
msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
#: git-bisect.sh:178
msgid "won't bisect on cg-seek'ed tree"
-msgstr "não é possível bisseccionar numa árvore \"cg-seek'ed\""
+msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
#: git-bisect.sh:182
msgid "Bad HEAD - strange symbolic ref"
@@ -11607,7 +12073,7 @@ msgstr "'git bisect $TERM_BAD' só leva um argumento."
#: git-bisect.sh:322
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Aviso: a bisseccionar só com um commit $TERM_BAD."
+msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
@@ -11638,7 +12104,7 @@ msgstr ""
#: git-bisect.sh:414 git-bisect.sh:546
msgid "We are not bisecting."
-msgstr "Não estamos a bisseccionar."
+msgstr "Não se está a bissetar."
#: git-bisect.sh:421
#, sh-format
@@ -11678,12 +12144,12 @@ msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-"falha bisseccionar:\n"
+"falha ao bissetar:\n"
"código de saída $res de '$command' é < 0 ou >= 128"
#: git-bisect.sh:525
msgid "bisect run cannot continue any more"
-msgstr "não é possível continuar a bisseccionar"
+msgstr "não é possível continuar a bissetar"
#: git-bisect.sh:531
#, sh-format
@@ -11691,7 +12157,7 @@ msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-"falha ao bisseccionar:\n"
+"falha ao bissetar:\n"
"'bisect_state $state' retornou com o código de erro $res"
#: git-bisect.sh:538
@@ -11721,7 +12187,7 @@ msgstr "não é possível alterar o significado do termo '$term'"
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-"Comando inválido: bissecção em curso usando os termo $TERM_BAD/$TERM_GOOD."
+"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
#: git-bisect.sh:636
msgid "no terms defined"
@@ -11748,63 +12214,59 @@ msgstr ""
"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
"abort\"."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
-msgstr "Autostash aplicado."
+msgstr "Pilha automática (autostash) aplicada."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Não é possível guardar $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
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 ""
-"Surgiram conflitos ao aplicar autostash.\n"
-"As suas alterações estão guardadas no stash.\n"
+"Surgiram conflitos ao aplicar a pilha automática (autostash).\n"
+"As suas alterações estão guardadas na pilha.\n"
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Rebase recusado pelo hook pre-rebase."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "A opção --exec deve ser usada com a opção --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Rebase não está em curso?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Não é possível ler HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-"Deve editar todos os conflitos do merge e\n"
-"marcá-los como resolvidos usando git add"
+"Deve editar todos os conflitos da integração\n"
+"e marcá-los como resolvidos usando git add"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Não foi possível voltar para $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11825,65 +12287,65 @@ msgstr ""
"e execute o comando de novo. A execução foi interrompida no caso de\n"
"ainda ter algo importante nesse sítio."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "$upstream_name a montante inválido"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: há mais do que uma base de merge"
+msgstr "$onto_name: há mais do que uma base de integração"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: não há nenhuma base de merge"
+msgstr "$onto_name: não há nenhuma base de integração"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Não aponta para um commit válido: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: ramo inexistente: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
-msgstr "Não é possível efetuar autostash"
+msgstr "Não é possível empilhar automaticamente (autostash)"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
-msgstr "Autostash criado: $stash_abbrev"
+msgstr "Pilha automática (autostash) criada: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
-msgstr "Faça commit ou stash delas."
+msgstr "Submeta ou empilhe-as (stash)."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "O ramo atual $branch_name está atualizado."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Alterações de $mb para $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Primeiro, a recuar a cabeça para replicar as suas alterações no topo desta..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name avançado rapidamente para $onto_name."
@@ -11946,7 +12408,7 @@ msgstr "Não há alterações locais para guardar"
#: git-stash.sh:264
msgid "Cannot initialize stash"
-msgstr "Não é possível inicializar o stash"
+msgstr "Não é possível inicializar a pilha"
#: git-stash.sh:268
msgid "Cannot save the current status"
@@ -11963,7 +12425,7 @@ msgstr "opção desconhecido: $opt"
#: git-stash.sh:415
msgid "No stash found."
-msgstr "Nenhum stash encontrado."
+msgstr "Nenhuma pilha encontrada."
#: git-stash.sh:422
#, sh-format
@@ -11978,12 +12440,12 @@ msgstr "$reference não é uma referência válida"
#: git-stash.sh:456
#, sh-format
msgid "'$args' is not a stash-like commit"
-msgstr "'$args' não é um commit do tipo stash"
+msgstr "'$args' não é um commit semelhante a pilha"
#: git-stash.sh:467
#, sh-format
msgid "'$args' is not a stash reference"
-msgstr "'$args' não é uma referência de stash"
+msgstr "'$args' não é uma referência de pilha"
#: git-stash.sh:475
msgid "unable to refresh index"
@@ -11991,7 +12453,7 @@ msgstr "não foi possível refrescar o índice"
#: git-stash.sh:479
msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Não é possível aplicar um stash durante um merge"
+msgstr "Não é possível aplicar uma pilha durante uma integração"
#: git-stash.sh:487
msgid "Conflicts in index. Try without --index."
@@ -12003,7 +12465,7 @@ msgstr "Não foi possível guardar árvore do índice"
#: git-stash.sh:523
msgid "Cannot unstage modified files"
-msgstr "Não é possível retirar os ficheiros modificado do índice"
+msgstr "Não é possível despreparar os ficheiros modificado"
#: git-stash.sh:538
msgid "Index was not unstashed."
@@ -12017,7 +12479,7 @@ msgstr "A descartar ${REV} ($s)"
#: git-stash.sh:562
#, sh-format
msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Não foi possível descartar elemento do stash"
+msgstr "${REV}: Não foi possível descartar elemento da pilha"
#: git-stash.sh:570
msgid "No branch name specified"
@@ -12027,28 +12489,23 @@ msgstr "Nenhum nome de ramo especificado"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Para os restaurar execute \"git stash apply\")"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "não é possível tirar um componente do URL '$remoteurl'"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
"trabalho"
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' já existe no índice"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12059,255 +12516,280 @@ msgstr ""
"$sm_path\n"
"Use -f se pretende mesmo adicioná-lo."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "A adicionar repositório existente em '$sm_path' ao índice"
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' já existe e não é uma repositório git válido"
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr ""
"Se deseja reutilizar este diretório git local em vez de clonar de novo de"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"use a opção '--force'. Se o diretório git local não é o repositório correto"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"ou não tem a certeza do que isto significa, escolha outro nome com a opção "
-"'--name'."
+"ou se não tem a certeza do que isto significa, escolha outro nome com a "
+"opção '--name'."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "A reativar o diretório git local do submódulo '$sm_name'."
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Não foi possível extrair o submódulo '$sm_path'"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falha ao registar o submódulo '$sm_path'"
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "A entrar em '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "A entrar em '$displaypath'"
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-"Interrompido em '$prefix$displaypath'; o script retornou um valor diferente "
-"de zero."
-
-#: git-submodule.sh:483
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "Nenhum URL encontrado no submódulo '$displaypath' em .gitmodules"
-
-#: git-submodule.sh:492
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Falha ao registar o URL do submódulo '$displaypath'"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Submódulo '$name' ($url) registado em '$displaypath'"
+"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
-#: git-submodule.sh:511
+#: git-submodule.sh:448
#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "Falha ao registar o modo de atualização do submódulo em '$displaypath'"
+msgid "pathspec and --all are incompatible"
+msgstr "especificador de caminho e --all são incompatíveis"
-#: git-submodule.sh:549
+#: git-submodule.sh:453
#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Use '.' se pretende mesmo anular a inicialização todos os submódulos"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
-"A árvore de trabalho do submódulo em '$displaypath' contém um diretório .git"
+"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr ""
-"A árvore de trabalho do submódulo em '$displaypath' contém alterações "
-"locais; use '-f' para as descartar"
+"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
+"use '-f' para as descartar"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Diretório '$displaypath' limpo"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-"Não foi possível remover a árvore de trabalho do submódulo em '$displaypath'"
+"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Submódulo em '$displaypath' não inicializado\n"
-"Talvez queira usar 'update --init'?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-"Não foi possível encontrar a revisão atual no submódulo em '$displaypath'"
+"Não foi possível encontrar a revisão atual no caminho de submódulo "
+"'$displaypath'"
-#: git-submodule.sh:745
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Não foi possível obter no submódulo '$sm_path'"
+msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
-#: git-submodule.sh:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Não é possível obter no submódulo '$displaypath'"
+msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Não foi possível extrair '$sha1' no submódulo em '$displaypath'"
+msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Submódulo em '$displaypath': '$sha1' extraído"
+msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-"Não foi possível efetuar rebase de '$sha1' no submódulo em '$displaypath'"
+"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
+"'$displaypath'"
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Submódulo em '$displaypath': rebase concluído em '$sha1'"
+msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Não é possível efetuar merge de '$sha1' no submódulo em '$displaypath'"
+msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Submódulo em '$displaypath': merge em '$sha1' concluído"
+msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "Falha ao executar '$command $sha1' no submódulo em '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Submódulo em '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Falha ao percorrer o submódulo em '$displaypath'"
+msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "A opção --cached não pode ser usada com a opção --files"
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo inesperado $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Aviso: $display_name não contém o commit $sha1_src"
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warn: $display_name não contém o commit $sha1_dst"
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Falha ao percorrer recursivamente o submódulo em '$sm_path'"
+msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "A sincronizar o URL do submódulo em '$displaypath'"
+msgstr "A sincronizar o URL do submódulo '$displaypath'"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
+
+#~ msgid "'%s': %s"
+#~ msgstr "'%s': %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "não é possível aceder a '%s': %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "não foi possível abrir '%s' para leitura: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "não foi possível abrir '%s' para escrita: %s"
+
+#~ msgid " git branch -d %s\n"
+#~ msgstr " git branch -d %s\n"
+
+#~ msgid " git branch --set-upstream-to %s\n"
+#~ msgstr " git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "não é possível abrir %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
+#~ "prosseguir"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "não foi possível validar a tag '%s'"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "falha ao remover: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "A opção --exec deve ser usada com a opção --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Submódulo em '$displaypath' não inicializado\n"
+#~ "Talvez queira usar 'update --init'?"
#~ msgid "unable to parse format"
#~ msgstr "não foi possível analisar o formato"
@@ -12354,8 +12836,8 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'"
#~ "Quando push.default está definido como 'matching', o Git publica\n"
#~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n"
#~ "\n"
-#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo "
-#~ "'simple',\n"
+#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo 'simple',"
+#~ "\n"
#~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n"
#~ "para atualizar o ramo atual com 'git pull'.\n"
#~ "Consulte 'git help config' e procure por 'push.default' para mais "
@@ -12369,9 +12851,6 @@ msgstr "A sincronizar o URL do submódulo em '$displaypath'"
#~ msgid "Could not append '%s'"
#~ msgstr "Não foi possível acrescentar '%s'"
-#~ msgid "Could not set '%s'"
-#~ msgstr "Não foi possível definir '%s'"
-
#~ msgid "Missing author: %s"
#~ msgstr "Autor em falta: %s"
diff --git a/po/ru.po b/po/ru.po
index c0a838b..617e5f54 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,14 +4,14 @@
#
# Translators:
# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2016
-# insolor <insolor@gmail.com>, 2014
-# insolor <insolor@gmail.com>, 2014
+# insolor, 2014
+# insolor, 2014
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-15 18:54+0000\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-11 09:37+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid ""
"as appropriate to mark resolution and make a commit."
msgstr "ИÑправьте их в рабочем каталоге, затем запуÑтите «git add/rm <файл>»,\nчтобы пометить иÑправление и Ñделайте коммит."
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD)."
@@ -74,7 +74,7 @@ msgstr "формат"
msgid "archive format"
msgstr "формат архива"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "префикÑ"
@@ -82,9 +82,9 @@ msgstr "префикÑ"
msgid "prepend prefix to each pathname in the archive"
msgstr "добавлÑÑ‚ÑŒ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿ÐµÑ€ÐµÐ´ каждым путем файла в архиве"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -118,7 +118,8 @@ msgstr "Ñжимать лучше"
msgid "list supported archive formats"
msgstr "перечиÑлить поддерживаемые форматы архивов"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "репозиторий"
@@ -255,11 +256,16 @@ msgstr "Ðеоднозначное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»."
msgid "Not a valid branch point: '%s'."
msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° ветки: «%s»."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находитÑÑ Ð½Ð° «%s»"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD рабочего каталога %s не обновлён"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -270,7 +276,7 @@ msgstr "«%s» не похож на файл пакета верÑии 2"
msgid "unrecognized header: %s%s (%d)"
msgstr "неопознанный заголовок: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
@@ -279,10 +285,10 @@ msgstr "не удалоÑÑŒ открыть «%s»"
msgid "Repository lacks these prerequisite commits:"
msgstr "Ð’ репозитории отÑутÑтвуют необходимые коммиты:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "Ñбой инициализации прохода по редакциÑм"
@@ -325,21 +331,21 @@ msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° rev-list"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ÑÑылка «%s» иÑключена в ÑоответÑтвии Ñ Ð¾Ð¿Ñ†Ð¸Ñми rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Отклонение ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿ÑƒÑтого пакета."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "не удалоÑÑŒ Ñоздать «%s»"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° index-pack"
@@ -348,8 +354,8 @@ msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° index-pack"
msgid "invalid color value: %.*s"
msgstr "недопуÑтимое значение цвета: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "не удалоÑÑŒ разобрать %s"
@@ -383,21 +389,21 @@ msgstr "неправильное чиÑловое значение «%s» длÑ
msgid "failed to expand user dir in: '%s'"
msgstr "Ñбой Ñ€Ð°Ð·Ð²Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ каталога пользователÑ: «%s»"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправильный уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ zlib %d"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "недопуÑтимый режим ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "не удалоÑÑŒ разобрать конфигурацию из командной Ñтроки"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при чтении файлов конфигурации"
@@ -416,24 +422,27 @@ msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ Â
msgid "%s has multiple values"
msgstr "%s имеет неÑколько значений"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "не удалоÑÑŒ уÑтановить «%s» в «%s»"
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Ðе удалоÑÑŒ уÑтановить «%s» в «%s»"
+msgid "could not unset '%s'"
+msgstr "не удалоÑÑŒ ÑброÑить значение Ð´Ð»Ñ Â«%s»"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Ðе удалоÑÑŒ запуÑтить «git rev-list»"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "Ñбой запиÑи в rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "Ñбой запиÑи в rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "Ñбой Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñтандартного ввода у rev-list: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "Ñбой Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñтандартного ввода у rev-list"
#: date.c:95
msgid "in the future"
@@ -526,62 +535,62 @@ msgstr[3] "%lu лет назад"
msgid "failed to read orderfile '%s'"
msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ orderfile «%s»"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "ВыполнÑетÑÑ Ð½ÐµÑ‚Ð¾Ñ‡Ð½Ð¾Ðµ определение переименованиÑ"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Сбой разбора величины Ñреза (cut-off) у dirstat «%s»\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "ÐеизвеÑтный параметр dirstat: «%s»\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "ÐеизвеÑтное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ «diff.submodule»: «%s»"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Ðайдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при внешнем Ñравнении, оÑтанов на %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одной Ñпецификации пути"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Сбой разбора параметра опции --submodule: «%s»"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "не удалоÑÑŒ получить Ð¸Ð¼Ñ Ñдра и информацию"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr "КÑш неотÑлеживаемых файлов отключен на Ñтой ÑиÑтеме или в Ñтом меÑте."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "не удалоÑÑŒ запуÑтить gpg."
@@ -595,28 +604,28 @@ msgstr "gpg не удалоÑÑŒ подпиÑать данные"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "не удалоÑÑŒ Ñоздать временный файл «%s»: %s"
+msgid "could not create temporary file '%s'"
+msgstr "не удалоÑÑŒ Ñоздать временный файл «%s»"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "Ñбой запиÑи отÑоединенной подпиÑи в «%s»: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "Ñбой запиÑи отÑоединенной подпиÑи в «%s»"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: не удалоÑÑŒ прочеÑÑ‚ÑŒ %s"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "«%s»: %s"
+msgid "failed to stat '%s'"
+msgstr "не удалоÑÑŒ выполнить stat «%s»"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "«%s»: Ñлишком мало данных прочитано %s"
+msgid "'%s': short read"
+msgstr "«%s»: Ñлишком мало данных прочитано"
#: help.c:205
#, c-format
@@ -676,12 +685,29 @@ msgstr[3] "\nВозможно, вы имели в виду что-то из ÑÑ‚
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
+#: lockfile.c:152
+#, 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 запущен в Ñтом репозитории,\nнапример редактор открыт из «git commit». ПожалуйÑта, убедитеÑÑŒ,\nчто вÑе процеÑÑÑ‹ были завершены и потом попробуйте Ñнова.\nЕÑли Ñто не поможет, то возможно процеÑÑ git был ранее завершен\nÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ в Ñтом репозитории: \nудалите файл вручную Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ."
+
+#: lockfile.c:160
+#, 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:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "не удалоÑÑŒ запиÑать новый файл индекÑа"
@@ -728,7 +754,7 @@ msgstr "невозможно прочитать объект %s «%s»"
msgid "blob expected for %s '%s'"
msgstr "ожидаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ объект Ð´Ð»Ñ %s «%s»"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
@@ -855,7 +881,7 @@ msgstr "ПропуÑк %s (Ñлиты одинаковые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº
msgid "Auto-merging %s"
msgstr "ÐвтоÑлиÑние %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "подмодуль"
@@ -883,34 +909,34 @@ 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:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Добавление %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° ÑлиÑниÑ, такого не должно ÑлучатьÑÑ."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Уже обновлено!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Ñбой ÑлиÑÐ½Ð¸Ñ Ð´ÐµÑ€ÐµÐ²ÑŒÐµÐ² «%s» и «%s»"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Ðеобработанный путь??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "СлиÑние:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -919,16 +945,16 @@ msgstr[1] "найдено %u общих предка:"
msgstr[2] "найдено %u общих предков:"
msgstr[3] "найдено %u общих предков:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "ÑлиÑние не вернуло коммит"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Ðе удалоÑÑŒ разобрать объект «%s»"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Ðе удаетÑÑ Ð·Ð°Ð¿Ð¸Ñать индекÑ."
@@ -958,28 +984,28 @@ msgstr "Ðеправильное значение переменной %s: «%sÂ
msgid "unable to parse object: %s"
msgstr "не удалоÑÑŒ разобрать объект: %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "…"
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "иÑпользование: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-КОЛИЧЕСТВО"
@@ -988,7 +1014,7 @@ msgstr "-КОЛИЧЕСТВО"
msgid "malformed object name '%s'"
msgstr "Ðеправильное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Ðе удалоÑÑŒ предоÑтавить доÑтуп к %s на запиÑÑŒ"
@@ -1053,7 +1079,7 @@ msgid ""
"Perhaps you forgot to add either ':/' or '.' ?"
msgstr "Ðе указан шаблон Ð´Ð»Ñ Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ :(exclude).\nВозможно, вы забыли «:/» или «.» ?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "не удалоÑÑŒ разобрать формат Ð´Ð»Ñ --pretty"
@@ -1075,23 +1101,23 @@ msgid ""
"Using version %i"
msgstr "GIT_INDEX_VERSION указан, но значение недейÑтвительное.\nИÑпользую верÑию %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "не удалоÑÑŒ удалить ÑÑылку %s: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "не удалоÑÑŒ удалить ÑÑылки: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "не удалоÑÑŒ удалить ÑÑылки %s"
@@ -1230,82 +1256,82 @@ msgstr "format: пропущена чаÑтица %%(end)"
msgid "malformed object name %s"
msgstr "неправильное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s"
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ одновременно %s и %s в %s"
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s обычно отÑлеживает %s, а не %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s отÑлеживает и %s и %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD не указывает на ветку"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "нет такой ветки: «%s»"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° не наÑтроена Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»"
-#: remote.c:1695
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не Ñохранена как отÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ°"
-#: remote.c:1710
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "назначение Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» на внешнем Ñервере «%s» не имеет локальной отÑлеживаемой ветки"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ветка «%s» не имеет внешнего Ñервера Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Ñпецификации пути Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» не включают в ÑÐµÐ±Ñ Â«%s»"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "отправка не имеет точки Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ (push.default выÑтавлен в «nothing»)"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "не удалоÑÑŒ выполнить «simple» отправку в единÑтвенную точку назначениÑ"
-#: remote.c:2073
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Ваша ветка базируетÑÑ Ð½Ð° «%s», но вышеÑтоÑщий репозиторий иÑчез.\n"
-#: remote.c:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr "(Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿ÑƒÑтите «git branch --unset-upstream»)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Ваша ветка обновлена в ÑоответÑтвии Ñ Â«%s».\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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"
@@ -1314,11 +1340,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.
msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: remote.c:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (иÑпользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1328,11 +1354,11 @@ msgstr[1] "Ваша ветка отÑтает от «%s» на %d коммита
msgstr[2] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n"
msgstr[3] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (иÑпользуйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1345,20 +1371,20 @@ msgstr[1] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь
msgstr[2] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n"
msgstr[3] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n"
-#: remote.c:2114
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (иÑпользуйте «git pull», чтобы Ñлить внешнюю ветку в вашу)\n"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "похоже, ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° повреждена"
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» еще не Ñодержит ни одного коммита"
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "опцию --first-parent Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --bisect"
@@ -1402,7 +1428,7 @@ msgid ""
"and commit the result with 'git commit'"
msgstr "поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð², пометьте иÑправленные пути\nÑ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git add <пути>» или «git rm <пути>»\nи Ñделайте коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git commit»"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Ðе удалоÑÑŒ запиÑать в %s"
@@ -1560,12 +1586,12 @@ msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»
msgid "Could not create sequencer directory %s"
msgstr "Ðе удалоÑÑŒ Ñоздать каталог Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² %s"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Ошибка Ð¾Ð±Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "отбор лучшего или возврат коммита не выполнÑетÑÑ"
@@ -1577,63 +1603,72 @@ msgstr "не удалоÑÑŒ определить HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð²ÐµÑ‚ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñоздана"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "не удалоÑÑŒ открыть %s: %s"
+msgid "cannot open %s"
+msgstr "не удалоÑÑŒ открыть %s"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "не удалоÑÑŒ прочитать %s: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "неожиданный конец файла"
-#: sequencer.c:888
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "Ñохраненный файл Ñ HEAD перед отбором лучшего «%s» поврежден"
-#: sequencer.c:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Ðе удалоÑÑŒ отформатировать %s."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не удалоÑÑŒ отобрать %s"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: Ð¿Ð»Ð¾Ñ…Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ изначальный коммит"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ лучшее в пуÑтую ветку"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "не удалоÑÑŒ прочитать %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "ÐžÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ git Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ <= %d, а обнаружена %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "обнаружены неизвеÑтные раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "Ñдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "Ñдвиг до начала индекÑа пакета Ð´Ð»Ñ %s (повреждён индекÑ?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "Ñдвиг за пределами индекÑа пакета Ð´Ð»Ñ %s (обрезан индекÑ?)"
@@ -1651,29 +1686,38 @@ msgid ""
"running \"git config advice.objectNameWarning false\""
msgstr "Обычно Git не Ñоздает ÑÑылки, оканчивающиеÑÑ Ð½Ð° 40 шеÑтнадцатеричных\nÑимволов, потому, что они будут игнорироватьÑÑ, когда вы проÑто\nукажете Ñто 40-Ñимвольное шеÑтнадцатеричное чиÑло. Такие ÑÑылки\nмогли быть Ñозданы по ошибке. Ðапример, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git checkout -b $br $(git rev-parse …)\n\n, еÑли «$br» оказалÑÑ Ð¿ÑƒÑтым, то ÑÑылка Ñ 40-Ñимвольным\nшеÑтнадцатеричным чиÑлом будет Ñоздана. ПожалуйÑта, проÑмотрите Ñти\nÑÑылки и, возможно, удалите их. Ð’Ñ‹ можете отключить Ñто Ñообщение\nзапуÑтив «git config advice.objectNameWarning false»"
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "Ðе удалоÑÑŒ изменить не Ñлитый .gitmodules, Ñначала разрешите конфликты"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Ðе удалоÑÑŒ найти раздел в .gitmodules, где путь равен %s"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr " Ðе удалоÑÑŒ обновить .gitmodules запиÑÑŒ %s"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Ðе удалоÑÑŒ удалить запиÑÑŒ в .gitmodules Ð´Ð»Ñ %s"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "Ñбой индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ .gitmodules"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать отприцательные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "неправильное значение %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1733,7 +1777,171 @@ msgstr "не удалоÑÑŒ переименовать временный фай
msgid "Could not read ref %s"
msgstr "Ðе удалоÑÑŒ прочитать ÑÑылку %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%sСделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ переключением веток."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при ÑлиÑнии:\n%%sСделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ ÑлиÑнием веток."
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при ÑлиÑнии:\n%%s"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при %s:\n%%sСделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при %s:\n%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr "Обновление указанных каталогов приведет к потере неотÑлеживаемых файлов в них:\n%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при переключении на ÑоÑтоÑние:\n%%sПеремеÑтите Ñти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при переключении на ÑоÑтоÑние:\n%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при ÑлиÑнии:\n%%sПеремеÑтите Ñти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при ÑлиÑнии:\n%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПеремеÑтите Ñти файлы или удалите их перед %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%sПеремеÑтите Ñти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при ÑлиÑнии:\n%%sПеремеÑтите Ñти файлы или удалите их перед переключением веток."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при ÑлиÑнии:\n%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при %s:\n%%sПеремеÑтите Ñти файлы или удалите их перед %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при %s:\n%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "ЗапиÑÑŒ «%s» чаÑтично Ñовпадает Ñ Â«%s». Ðе удалоÑÑŒ назначить ÑоответÑтвие."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr "Ðе удалоÑÑŒ обновить чаÑтичное ÑоÑтоÑние: Ñледующие Ñлементы не поÑледней верÑии:\n%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут перезапиÑаны при обновлении чаÑтичного ÑоÑтоÑниÑ:\n%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении чаÑтичного ÑоÑтоÑниÑ:\n%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Прерываю\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "РаÑпаковка файлов"
@@ -1771,231 +1979,227 @@ msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ пути «..»"
msgid "could not open '%s' for reading and writing"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "«%s» недоÑтупно: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "«%s» недоÑтупно"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "не удалоÑÑŒ получить текущий рабочий каталог"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "не удалоÑÑŒ запиÑать в %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "не удалоÑÑŒ закрыть %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Ðе Ñлитые пути:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (иÑпользуйте «git reset %s <файл>…», чтобы убрать из индекÑа)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (иÑпользуйте «git rm --cached <файл>…», чтобы убрать из индекÑа)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (иÑпользуйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (иÑпользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "ИзменениÑ, которые будут включены в коммит:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "ИзменениÑ, которые не в индекÑе Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (иÑпользуйте «git add <файл>…», чтобы добавить файл в индекÑ)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекÑа)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working "
"directory)"
msgstr " (иÑпользуйте «git checkout -- <файл>…», чтобы отменить изменениÑ\n в рабочем каталоге)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (Ñделайте коммит или отмените Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² неотÑлеживаемом или измененном Ñодержимом в подмодулÑÑ…)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (иÑпользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "оба удалены:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "добавлено нами:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "удалено ими:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "добавлено ими:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "удалено нами:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "оба добавлены:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "оба измены:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "ошибка: необработанный ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ñлитых изменений %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "новый файл:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "Ñкопировано:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "удалено:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "изменено:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "переименовано:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "изменен тип:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "неизвеÑтно:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "не Ñлитые:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "новые коммиты, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "изменено Ñодержимое, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "неотÑлеживаемое Ñодержимое, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "ошибка: необработанный ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Измененные, но не обновленные подмодули:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, которые будут закоммичены:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
msgstr "Ðе трогайте Ñтроку выше Ñтой.\nÐ’ÑÑ‘, что ниже — будет удалено."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ не Ñлитые пути."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (разрешите конфликты, затем запуÑтите «git commit»)"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Ð’Ñе конфликты иÑправлены, но вы вÑе еще в процеÑÑе ÑлиÑниÑ."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (иÑпользуйте «git commit», чтобы завершить ÑлиÑние)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Ð’Ñ‹ в процеÑÑе ÑеÑÑии am."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Текущий патч пуÑтой."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (разрешите конфликты, затем запуÑтите «git am --continue»)"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (иÑпользуйте «git am --skip», чтобы пропуÑтить Ñтот патч)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (иÑпользуйте «git am --abort», чтобы воÑÑтановить оригинальную ветку)"
@@ -2137,43 +2341,43 @@ msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка."
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (иÑпользуйте «git bisect reset», чтобы вернутьÑÑ Ð½Ð° иÑходную ветку)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "Ðа ветке "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "интерактивное перемещение в процеÑÑе; над "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "перемещение в процеÑÑе; над "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD отделён на "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток"
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Ðачальный коммит"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "ÐеотÑлеживаемые файлы"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Игнорируемые файлы"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2181,82 +2385,82 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr "%.2f Ñекунды занÑл вывод ÑпиÑка неотÑлеживаемых файлов. «status -uno» возможно может уÑкорить Ñто, но будьте внимательны, и не забудьте добавить новые файлы вручную (Ñмотрите «git help status» Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей)."
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "ÐеотÑлеживаемые файлы не показаны%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr "(иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Ðет изменений"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n(иÑпользуйте «git add» и/или «git commit -a»)\n"
-#: wt-status.c:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы (иÑпользуйте «git add», чтобы отÑлеживать их)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы\n"
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "нечего коммитить (Ñоздайте/Ñкопируйте файлы, затем запуÑтите «git add», чтобы отÑлеживать их)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "нечего коммитить\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "нечего коммитить (иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)\n"
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Ðачальный коммит на "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (нет ветки)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "иÑчез"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "позади"
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "впереди "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "Ñбой отÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Â«%s»"
@@ -2270,7 +2474,7 @@ msgstr "git add [<опции>] [--] <ÑпецификациÑ-пути>…"
msgid "unexpected diff status %c"
msgstr "неожиданный ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ð¹ %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "Ñбой при обновлении файлов"
@@ -2283,7 +2487,7 @@ msgstr "удалить «%s»\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Ðе удалоÑÑŒ прочитать индекÑ"
@@ -2319,14 +2523,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "пробный запуÑк"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "быть многоÑловнее"
@@ -2334,7 +2538,7 @@ msgstr "быть многоÑловнее"
msgid "interactive picking"
msgstr "интерактивный выбор"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "интерактивный выбор блоков"
@@ -2402,16 +2606,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Возможно, вы имели в виду «git add .»?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "файл индекÑа поврежден"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "не удалоÑÑŒ прочитать «%s»"
@@ -2439,16 +2643,6 @@ msgstr "Ðе удалоÑÑŒ Ñкопировать заметку из «%s» в
msgid "fseek failed"
msgstr "Ñбой при выполнении fseek"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2458,340 +2652,342 @@ msgstr "не удалоÑÑŒ разобрать патч «%s»"
msgid "Only one StGIT patch series can be applied at once"
msgstr "Только ÑÐµÑ€Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡ÐµÐ¹ StGIT может быть применена за раз"
-#: builtin/am.c:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° даты/времени"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñтрока даты"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "недопуÑтимое Ñмещение чаÑового поÑÑа"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Сбой Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° патча."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Ðе удалоÑÑŒ разделить патчи на чаÑти."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "не удалоÑÑŒ запиÑать индекÑ"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Когда вы уÑтраните Ñту проблему, запуÑтите «%s --continue»."
-#: builtin/am.c:1189
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "ЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «%s --skip»."
-#: builtin/am.c:1190
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Чтобы вернутьÑÑ Ð½Ð° предыдущую ветку и оÑтановить применение изменений, запуÑтите «%s --abort»."
-#: builtin/am.c:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Патч пуÑÑ‚. Возможно, он был неправильно разделён?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "не удалоÑÑŒ разобрать коммит %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Ð’ репозитории отÑутÑтвуют двоичные объекты, необходимые Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‚Ð° к трехходовому ÑлиÑнию."
-#: builtin/am.c:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "ИÑпользую Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ Ñ€ÐµÐºÐ¾Ð½Ñтрукции базового дерева…"
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "Ð’Ñ‹ вручную изменÑли патч?\nОн не накладываетÑÑ Ð±ÐµÐ· ошибок на двоичные объекты, запиÑанные в его заголовке."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr "Откат к применению изменений к базовому коммиту Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ трехходового ÑлиÑниÑ…"
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "Ðе удалоÑÑŒ Ñлить изменениÑ."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-tree не удалоÑÑŒ запиÑать дерево"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "применение к пуÑтой иÑтории"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "Ñбой запиÑи объекта коммита"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð½Ð¸Ñ‚ÑŒ: %s не ÑущеÑтвует "
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "не удалоÑÑŒ иÑпользовать интерактивное поведение, без stdin подключенного к терминалу."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
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:1784
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - проÑмотреть патч/[a] - применить вÑÑ‘: "
-#: builtin/am.c:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ пуÑтой: Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÑ‚ÑŒ патчи (в индекÑе: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Применение: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Ðет изменений — Патч уже применен."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ на %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Копию изменений, которые не удалоÑÑŒ применить, вы можете найти в: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
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ЕÑли ничего не оÑталоÑÑŒ Ð´Ð»Ñ Ð¸Ð½Ð´ÐµÐºÑации, то, Ñкорее вÑего, что-то другое уже Ñделало те же изменениÑ; возможно, вам Ñледует пропуÑтить Ñтот патч."
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
msgstr "У Ð²Ð°Ñ Ð²Ñе еще имеютÑÑ Ð½Ðµ Ñлитые пути в индекÑе.\nВозможно, вы забыли вызвать «git add»?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Ðе удалоÑÑŒ разобрать объект «%s»."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "не удалоÑÑŒ очиÑтить индекÑ"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "Похоже, что вы перемеÑтили HEAD Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° поÑледней ошибки Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«am».\nПеремотка на ORIG_HEAD не выполнÑетÑÑ"
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ðеправильное значение Ð´Ð»Ñ --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<опции>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "запуÑтить в интерактивном режиме"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "иÑторичеÑÐºÐ°Ñ Ð¾Ð¿Ñ†Ð¸Ñ â€” ничего не делает"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "разрешить откатитьÑÑ Ðº трехходовому ÑлиÑнию, еÑли нужно"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "тихий режим"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "добавить Ñтроку Signed-off-by к Ñообщению коммита"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "перекодировать в utf8 (по умолчанию)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "передать флаг -k в git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "передать флаг -b в git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "передать флаг -m в git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "передать флаг --keep-cr в git-mailsplit Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° mbox"
-#: builtin/am.c:2267
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "не передавать --keep-cr флаг в git-mailsplit вне завиÑимоÑти от am.keepcr"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "обрезать вÑе до Ñтроки обрезки"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "дейÑтвие"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "передать его в git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "корень"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "путь"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "количеÑтво"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "формат"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "формат, в котором находÑÑ‚ÑÑ Ð¿Ð°Ñ‚Ñ‡Ð¸"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "переопределить Ñообщение об ошибке, еÑли не удалоÑÑŒ наложить изменениÑ"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "продолжить применение изменений поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð»Ð¸ÐºÑ‚Ð°"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "Ñиноним Ð´Ð»Ñ --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "пропуÑтить текущий патч"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr "воÑÑтановить оригинальную ветку и отменить операцию Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹."
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "Ñоврать о дате коммитера"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "иÑпользовать текущее Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº Ð²Ñ€ÐµÐ¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ñтва"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "подпиÑать коммиты Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(внутреннее иÑпользование Ð´Ð»Ñ git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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 уже долгое Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ не делает и будет удалена Ñ Ñледующих верÑиÑÑ… Git. ПожалуйÑта, не иÑпользуйте ее."
-#: builtin/am.c:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "предыдущий каталог Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ %s еще ÑущеÑтвует, но передан mbox."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "Ðайден забытый каталог %s.\nИÑпользуйте «git am --abort», чтобы удалить его."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² не в процеÑÑе выполнениÑ, не продолжаем."
@@ -2824,37 +3020,37 @@ msgstr "regexec возвратил %d Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°: %s"
msgid "unable to find filename in patch at line %d"
msgstr "не удалоÑÑŒ найти Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в Ñтроке патча %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null, получено %s на Ñтроке %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ñтарое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null на Ñтроке %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: не Ð¾Ð¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ñтрока: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "фрагмент изменений без заголовка на Ñтроке %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
@@ -2867,65 +3063,65 @@ msgstr[1] "заголовок git diff не нашел информацию об
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "новый файл завиÑит от Ñтарого Ñодержимого"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "удаленный файл вÑе еще имеет Ñодержимое"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на Ñтроке %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s завиÑит от Ñтарого Ñодержимого"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s вÑе еще имеет Ñодержимое"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s ÑтановитÑÑ Ð¿ÑƒÑтым, но не удалÑетÑÑ"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на Ñтроке %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на Ñтроке %d"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч Ñ Ð¼ÑƒÑором на Ñтроке %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалоÑÑŒ прочитать Ñимвольную ÑÑылку %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "не удалоÑÑŒ открыть или прочеÑÑ‚ÑŒ %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало Ñтроки: «%c»"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -2934,177 +3130,177 @@ msgstr[1] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдв
msgstr[2] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)."
msgstr[3] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "КонтекÑÑ‚ Ñужен до (%ld/%ld), чтобы применить фрагмент на %d Ñтроке"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиÑке:\n%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча Ð´Ð»Ñ Â«%s»"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалоÑÑŒ применить двоичный патч к «%s»"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "поÑле Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ патча Ð´Ð»Ñ Â«%s» был получен неправильный результат (ожидалоÑÑŒ %s, получено %s)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
-msgstr "не удалоÑÑŒ перейти на %s"
+msgstr "не удалоÑÑŒ переключить ÑоÑтоÑние на %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %s"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за ÑимволичеÑкой ÑÑылкой"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индекÑе"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s: не Ñовпадает Ñ Ð¸Ð½Ð´ÐµÐºÑом"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "патч ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ удалил Ñодержимое файла"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидалÑÑ %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "неправильный путь «%s»"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже ÑодержитÑÑ Ð² индекÑе"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже ÑодержитÑÑ Ð² рабочем каталоге"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o) Ð´Ð»Ñ %s"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалоÑÑŒ применить патч"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "Ñбой make_cache_entry Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалоÑÑŒ удалить %s из индекÑа"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Ñозданного файла «%s»"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалоÑÑŒ Ñоздать вÑпомогательный файл Ð´Ð»Ñ Ñозданного файла %s"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалоÑÑŒ Ñоздать запиÑÑŒ в кÑше Ð´Ð»Ñ %s"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалоÑÑŒ запиÑать файл «%s» Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ доÑтупа %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -3113,147 +3309,157 @@ msgstr[1] "Применение патча %%s Ñ %d отказами…"
msgstr[2] "Применение патча %%s Ñ %d отказами…"
msgstr[3] "Применение патча %%s Ñ %d отказами…"
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "уÑечение имени .rej файла до %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "не удалоÑÑŒ открыть %s: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Патч «%s» пропущен."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "не раÑпознанный ввод"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "не удалоÑÑŒ прочитать файл индекÑа"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "не применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "удалить <количеÑтво> ведущих коÑÑ‹Ñ… черт из традиционных путей ÑпиÑка изменений"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "игнорировать добавлениÑ, Ñделанные Ñтим патчем"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику добавлений и удалений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "показать количеÑтво добавленных и удаленных Ñтрок в деÑÑтичном предÑтавлении"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику изменений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° проверить подходит ли он"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "проверить, что патч применÑетÑÑ Ðº текущему индекÑу"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "применить патч, не изменÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ каталог"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "принÑÑ‚ÑŒ патч, который затрагивает файлы за рабочим каталогом"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "а также применить патч (иÑпользуйте Ñ --stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "попытатьÑÑ Ñделать трехходовое ÑлиÑние, еÑли патч не применÑетÑÑ"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr "поÑтроить временный индекÑ, оÑнованный на вÑтроенной информации об индекÑе"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "пути, отделённые ÐУЛЕВЫМ Ñимволом"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "удоÑтоверитьÑÑ, что по крайней мере <n> Ñтрок контекÑта Ñовпадают"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "определÑÑ‚ÑŒ новые или модифицированные Ñтроки, у которых еÑÑ‚ÑŒ ошибки в пробельных Ñимволах"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² пробельных Ñимволах при поиÑке контекÑта"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "применить патч Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸ÐµÐ¼ изменений"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "не ожидать как минимум одной Ñтроки контекÑта"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оÑтавить отклоненные блоки изменений в ÑоответÑтвующих *.rej файлах"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеÑÑ Ð±Ð»Ð¾ÐºÐ¸ изменений"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "разрешить некорректно определенные пропущенные пуÑтые Ñтроки в конце файла"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверÑÑ‚ÑŒ количеÑтву Ñтрок из заголовка блока изменений"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "добавить <корень> Ñпереди ко вÑем именам файлов"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way вне репозиториÑ"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index вне репозиториÑ"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached вне репозиториÑ"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "не удалоÑÑŒ открыть патч «%s»"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -3262,7 +3468,7 @@ msgstr[1] "пропущено %d ошибки в пробельных Ñимво
msgstr[2] "пропущено %d ошибок в пробельных Ñимволах"
msgstr[3] "пропущено %d ошибок в пробельных Ñимволах"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3330,99 +3536,99 @@ msgstr "<опции-rev-list> документированы в git-rev-list(1)"
msgid "Blaming lines"
msgstr "ПроÑмотр авторов Ñтрок"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "Показать запиÑи авторÑтва поÑтепенно, в процеÑÑе нахождениÑ"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Ðе показывать SHA-1 Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², не входÑщих в границы запроÑа (По умолчанию: отключено)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Ðе воÑпринимать корневые коммиты как граничные (По умолчанию: отключено)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Показать ÑтатиÑтику раÑходов на выполнение запроÑа"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Принудительно выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Показать оценку Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñей авторÑтва"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "Показать оригинальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° (По умолчанию: автоматичеÑки)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "Показать оригинальные номера Ñтрок (По умолчанию: отключено)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Показать в формате Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ разбора"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "Показать в машиночитаемом формате, Ñ Ð¿Ð¾Ñтрочной информацией о коммите"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "ИÑпользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Ðе показывать Ð¸Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð° и временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr "Показать почту автора вмеÑто имени (По умолчанию: отключено)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Игнорировать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð² пробелах"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "Потратить больше времени, Ð´Ð»Ñ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐ¸Ñ… Ñовпадений"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "ИÑпользовать редакции из <файла> вмеÑто вызова git-rev-list"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "ИÑпользовать Ñодержимое <файла> как финальный Ñнимок"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "мин-длина"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "Ðайти копирование Ñтрок в пределах и между файлами"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "Ðайти Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñтрок в пределах и между файлами"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "начало,конец"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "Обработать только Ñтроки в диапазоне начало,конец, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1"
@@ -3432,392 +3638,413 @@ msgstr "Обработать только Ñтроки в диапазоне нÐ
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "4 года и 11 меÑÑцев назад"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<опции>] [-l] [-f] <имÑ-ветки> [<точка-начала>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<опции>] [-r] (-d | -D) <имÑ-ветки>…"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<опции>] (-m | -M) [<ÑтараÑ-ветка>] <новаÑ-ветка>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<опции>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr "удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° Ñлита Ñ\n «%s», но не Ñлита Ñ HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr "не удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñлита Ñ\n «%s», Ñ…Ð¾Ñ‚Ñ ÑƒÐ¶Ðµ Ñлита Ñ HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ Â«%s»"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, 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:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Ðе удалоÑÑŒ обновить файл конфигурации"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно ключи -a и -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ветку «%s», так как вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð° ней находитеÑÑŒ."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ветку «%s» Ñ‚.к. она активна на «%s»"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не найдена."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "ветка «%s» не найдена."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ отÑлеживаемой ветки «%s»"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "ВнешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s удалена (была %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: пропал]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: позади %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[позади %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: впереди %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[впереди %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: впереди %d, позади %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[впереди %d, позади %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÑÑылка ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(нет ветки, перемещение %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(нет ветки, двоичный поиÑк начат на %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD отделён на %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(нет ветки)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "ПроизводитÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ðµ ветки %s на %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "ПроизводитÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ поиÑк в ветке %s на %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, еÑли вы не находитеÑÑŒ ни на одной из них."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸: «%s»"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Сбой Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно Ð½Ð°Ð·Ð²Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s»"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Общие параметры"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "показывать Ñ…Ñш-Ñумму и тему, укажите дважды Ð´Ð»Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "не выводить информационные ÑообщениÑ"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "уÑтановить режим отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки (Ñм. git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "изменить информацию о вышеÑтоÑщей ветке"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "вышеÑтоÑщаÑ"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "изменить информацию о вышеÑтоÑщей ветке"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "иÑпользовать цветной вывод"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "выполнить дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° отÑлеживаемых внешних ветках"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "вывод только веток, которые Ñодержат коммит"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Специфичные Ð´Ð»Ñ git-branch дейÑтвиÑ:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "показать ÑпиÑок и отÑлеживаемых и локальных веток"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "удалить полноÑтью Ñлитую ветку"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "удалить ветку (даже никуда не Ñлитую)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "перемеÑтить/переименовать ветки и ее журнал ÑÑылок"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "перемеÑтить/переименовать ветку, даже еÑли целевое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ ÑущеÑтвует"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "показать ÑпиÑок имен веток"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "Ñоздать журнал ÑÑылок ветки"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "изменить опиÑание ветки"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "принудительное Ñоздание, перемещение или удаление ветки"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "вывод только Ñлитых веток"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "вывод только не Ñлитых веток"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "показать ÑпиÑок веток по Ñтолбцам"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "ключ"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ, по которому выполнить Ñортировку"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "объект"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "вывод только веток, определенного объекта"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Ðе удалоÑÑŒ определить HEAD как дейÑтвительную ÑÑылку."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column и --verbose Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "требуетÑÑ Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð°Ñ‚ÑŒ опиÑание отделённому HEAD"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ опиÑание более одной ветки за раз"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Ðет ветки Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "Ñлишком много веток Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ переименованиÑ"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… вышеÑтоÑщих"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "невозможно уÑтановить вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD на %s, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "нет такой ветки «%s»"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "ветка «%s» не ÑущеÑтвует"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐ±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщих"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "невозможно убрать вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ветка «%s» не имеет информации о вышеÑтоÑщей ветке"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "не имеет ÑмыÑла Ñоздавать «HEAD» вручную"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "параметры -a и -r Ð´Ð»Ñ Â«git branch» не имеют ÑмыÑла Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ имени ветки"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using "
"--track or --set-upstream-to\n"
msgstr "Флаг --set-upstream уÑтарел и будет удален в будущем. ВмеÑто него иÑпользуйте --track или --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3825,16 +4052,6 @@ msgid ""
"\n"
msgstr "\nЕÑли вы хотите, чтобы «%s» отÑлеживала «%s», Ñделайте Ñледующее:\n\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr "git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -3930,7 +4147,7 @@ msgstr "прочитать имена файлов из Ñтандартного
msgid "terminate input and output records by a NUL character"
msgstr "окончание ввода и вывода запиÑей по ÐУЛЕВОМУ Ñимволу"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
@@ -3993,7 +4210,7 @@ msgstr "Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть между 1 и 3 или all"
#: builtin/checkout-index.c:160
msgid "check out all files in the index"
-msgstr "перейти на ÑоÑтоÑние вÑех файлов из индекÑа"
+msgstr "переключитьÑÑ Ð½Ð° ÑоÑтоÑние вÑех файлов из индекÑа"
#: builtin/checkout-index.c:161
msgid "force overwrite of existing files"
@@ -4020,8 +4237,9 @@ msgid "write the content to temporary files"
msgstr "запиÑать Ñодержимое во временные файлы"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "Ñтрока"
@@ -4071,79 +4289,79 @@ msgstr "путь «%s»: не удалоÑÑŒ Ñлить"
msgid "Unable to add merge result for '%s'"
msgstr "Ðе удалоÑÑŒ добавить результат ÑлиÑÐ½Ð¸Ñ Â«%s»"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать при обновлении путей"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ пути и переключатьÑÑ Ð½Ð° ветку «%s» одновременно."
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "файл индекÑа поврежден"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "путь «%s» не Ñлит"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "Ñначала нужно разрешить конфликты в вашем текущем индекÑе"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Ðе удалоÑÑŒ Ñоздать журнал ÑÑылок Ð´Ð»Ñ Â«%s»: %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "не удалоÑÑŒ обновить HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и ÑÐ±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4160,7 +4378,7 @@ msgstr[1] "Предупреждение: вы оÑтавлÑете позади
msgstr[2] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4179,162 +4397,162 @@ msgstr[1] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ
msgstr[2] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n"
msgstr[3] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при хождении по редакциÑм"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ HEAD была"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "Ð’Ñ‹ находитеÑÑŒ на еще не Ñозданной ветке"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "ожидаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна ÑÑылка, а передано %d."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "в дереве нет такой ÑÑылки: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать пути при переключении веток"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать «%s» при переключении веток"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Â«%s»"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ветку на не коммит «%s»"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "ветка"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
-msgstr "Ñоздать и перейти на новую ветку"
+msgstr "Ñоздать и переключитьÑÑ Ð½Ð° новую ветку"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
-msgstr "Ñоздать/ÑброÑить и перейти на новую ветку"
+msgstr "Ñоздать/ÑброÑить и перключитьÑÑ Ð½Ð° новую ветку"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "Ñоздать журнал ÑÑылок Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "отÑоединить HEAD на указанном коммите"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "уÑтановить информацию о вышеÑтоÑщей ветке Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "новаÑ-ветка"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ° без родителей"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
-msgstr "перейти на нашу верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
+msgstr "переключитьÑÑ Ð½Ð° нашу верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
-msgstr "перейти на их верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
+msgstr "переключитьÑÑ Ð½Ð° их верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
-msgstr "принудительный переход (отбраÑывает вÑе локальные изменениÑ)"
+msgstr "принудительное переключение на ÑоÑтоÑние (отбраÑывает вÑе локальные изменениÑ)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "выполнить трехходовое ÑлиÑние Ñ Ð½Ð¾Ð²Ð¾Ð¹ веткой"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "обновить игнорируемые файлы (по умолчанию)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "Ñтиль"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "Ñтиль конфликтов ÑлиÑÐ½Ð¸Ñ (merge или diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "не ограничивать Ñпецификаторы пути только чаÑтичными запиÑÑми"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "переÑмотр «git checkout <no-such-branch>»"
+msgstr "переÑмотр «git checkout <нет-такой-ветки>»"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr "не проверÑÑ‚ÑŒ, что другое дерево уже Ñодержит указанную ÑÑылку"
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "принудительно выводить прогреÑÑ"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B и --orphan Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track требует Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Пропущено Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸; попробуйте -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚Ð¸"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пути и одновременно переключить на ветку «%s».\nÐ’Ñ‹ хотели переключитьÑÑ Ð½Ð° «%s», что не может быть определено как коммит?"
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пути и одновременно переключитьÑÑ Ð½Ð° ветку «%s».\nÐ’Ñ‹ хотели переключитьÑÑ Ð½Ð° «%s», что не может быть определено как коммит?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4466,8 +4684,8 @@ msgstr "Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка"
msgid "remove whole directories"
msgstr "удалить каталоги полноÑтью"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "шаблон"
@@ -4503,286 +4721,290 @@ msgstr "clean.requireForce уÑтановлен по умолчанию как t
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "Ñоздать голый репозиторий"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "Ñоздать зеркало Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ (включает в ÑÐµÐ±Ñ Ð¸ параметр bare)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· локального репозиториÑ"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "не иÑпользовать жеÑткие ÑÑылки, вÑегда копировать файлы"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "наÑтроить как общедоÑтупный репозиторий"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "количеÑтво подмодулей, которые будут клонированы парралельно"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут иÑпользованы"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "ÑÑылаемый репозиторий"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "иÑпользуйте --reference только при клонировании"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "имÑ"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "иÑпользовать <имÑ> вмеÑто «origin» Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщего репозиториÑ"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "перейти на <ветку>, вмеÑто HEAD внешнего репозиториÑ"
+msgstr "переключитьÑÑ Ð½Ð° <ветку>, вмеÑто HEAD внешнего репозиториÑ"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
msgid "depth"
msgstr "глубина"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "Ñделать чаÑтичный клон указанной глубины"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "вÑе Ñклонированные подмодули будут чаÑтичными клонами"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "размеÑтить каталог git отдельно от рабочей копии"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "ключ=значение"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "уÑтановить параметры внутри нового репозиториÑ"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "иÑпользовать только IPv4 адреÑа"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "иÑпользовать только IPv6 адреÑа"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "Ð˜Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° не может быть угадано.\nУкажите Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ параметра командной Ñтроки"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "ÑÑылаемый репозиторий «%s» как ÑвÑзанное ÑоÑтоÑние, пока не поддерживаетÑÑ."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ÑÑылаемый репозиторий «%s» не ÑвлÑетÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñ‡Ð°Ñтичным"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñращенным"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не удалоÑÑŒ выполнить stat «%s»"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже ÑущеÑтвует и не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "не удалоÑÑŒ выполнить stat %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалоÑÑŒ Ñоздать ÑÑылку «%s»"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалоÑÑŒ копировать файл в «%s»"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr "Клонирование прошло уÑпешно, но во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° на верÑию произошла ошибка.\nС помощь команды «git status» вы можете проÑмотреть, какие файлы были обновлены, а повторить попытку перехода на верÑию Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git checkout -f HEAD»\n"
+msgstr "Клонирование прошло уÑпешно, но во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÑоÑтоÑÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° ошибка.\nС помощь команды «git status» вы можете проÑмотреть, какие файлы были обновлены, а повторить попытку Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° ветку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git checkout -f HEAD»\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Ðе удалоÑÑŒ найти внешнюю ветку %s Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Проверка ÑоединениÑ… "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий приÑлал не вÑе необходимые объекты"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "не удалоÑÑŒ обновить %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ÑÑылку, Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ на такую верÑию.\n"
+msgstr "внешний HEAD ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ÑÑылку, Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ð½Ð° такую верÑию.\n"
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
-msgstr "не удалоÑÑŒ перейти на верÑию в рабочем каталоге"
+msgstr "не удалоÑÑŒ переключитьÑÑ Ð½Ð° верÑию в рабочем каталоге"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "не удалоÑÑŒ запиÑать параметры в файл конфигурации"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "не удалоÑÑŒ выполнить перепаковку Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "не удалоÑÑŒ отÑоединить временные альтернативные файлы"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "Ð’Ñ‹ должны указать репозиторий Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не ÑущеÑтвует"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не ÑвлÑетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ чиÑлом"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð¿ÑƒÑтым каталогом."
-#: builtin/clone.c:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже ÑущеÑтвует."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалоÑÑŒ Ñоздать родительÑкие каталоги Ð´Ð»Ñ Â«%s»"
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалоÑÑŒ Ñоздать рабочий каталог «%s»"
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируетÑÑ Ð½Ð° локальных клонах; вмеÑто Ñтого иÑпользуйте file://."
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "иÑходный репозиторий ÑвлÑетÑÑ Ñ‡Ð°Ñтичным, --local игнорируетÑÑ"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local игнорируетÑÑ"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Ðе знаю как клонировать %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ° %s не найдена в вышеÑтоÑщем репозитории %s"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пуÑтой репозиторий."
@@ -4885,103 +5107,103 @@ msgid ""
"the remaining commits.\n"
msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит отбор лучшего\nв оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°Ñ….\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "Ñбой раÑпаковки объекта дерева HEAD"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "не удалоÑÑŒ Ñоздать временный индекÑ"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "Ñбой интерактивного добавлениÑ"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "не удалоÑÑŒ обновить временный индекÑ"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении оÑновного кÑша дерева"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "не удалоÑÑŒ запиÑать файл new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð±Ð¾Ñ€Ð° лучшего коммита."
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "не удалоÑÑŒ прочитать индекÑ"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "не удалоÑÑŒ запиÑать временный файл индекÑа"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "у коммита «%s» отÑутÑтвует автор в заголовке"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "у коммита «%s» Ñтрока автора в неправильном формате"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "параметр --author в неправильном формате"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "неправильный формат даты: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñимвол комментариÑ, который\nне иÑпользуетÑÑ Ð² текущем Ñообщении коммита"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "не удалоÑÑŒ запроÑить коммит %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из Ñтандартного ввода)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "не удалоÑÑŒ прочитать файл журнала из Ñтандартного ввода"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "не удалоÑÑŒ прочитать файл журнала «%s»"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "не удалоÑÑŒ прочитать MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "не удалоÑÑŒ прочитать SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "не удалоÑÑŒ прочитать MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -4991,7 +5213,7 @@ msgid ""
"and try again.\n"
msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить ÑлиÑние.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5001,14 +5223,14 @@ msgid ""
"and try again.\n"
msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить отбор лучшего.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, 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 "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое Ñообщение\nотменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5016,341 +5238,341 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную,\nеÑли хотите. ПуÑтое Ñообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sÐвтор: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sКоммитер: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Ðе удалоÑÑŒ прочитать индекÑ"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Ошибка при поÑтроении деревьев"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "ПожалуйÑта, укажите Ñообщение, при указании опций -m или -F.\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате Â«Ð˜Ð¼Ñ <почта>» и не Ñовпадает Ñ ÑущеÑтвующим автором"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ðеправильный режим неотÑлеживаемых файлов «%s»"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long и -z Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет ÑмыÑла"
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Ðечего иÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ð’Ñ‹ в процеÑÑе ÑлиÑÐ½Ð¸Ñ â€” ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Ð’Ñ‹ в процеÑÑе отбора лучшего — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ."
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опции --squash и --fixup не могут иÑпользоватьÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "ÐžÐ¿Ñ†Ð¸Ñ -m не может иÑпользоватьÑÑ Ñ -c/-C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одновременно Ñ Ð¾Ð¿Ñ†Ð¸Ñми -C, -c или --amend."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr "Указание путей каталогов Ñ Ð¾Ð¿Ñ†Ð¸Ñми --include/--only не имеет ÑмыÑла."
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Умно… отмена поÑледнего Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñ‹Ð¼ индекÑом."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Пути Ñвно указаны пути без опций -i или -o; предполагаю опцию --only…"
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ðеправильное значение режима очиÑтки %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "С опцией -a указание пути не имеет ÑмыÑла."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "кратко показать ÑтатуÑ"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "показать информацию о верÑии"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "показать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð² длинном формате (по умолчанию)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "завершать запиÑи ÐУЛЕВЫМ байтом"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "показать неотÑлеживаемые файлы, опциональные режимы: all (вÑе), normal (как обычно), no (нет). (По умолчанию: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "показать игнорируемые файлы"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, опционально когда: all (вÑегда), dirty (измененные), untracked (неотÑлеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "показать неотÑлеживаемые файлы по Ñтолбцам"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñить новоÑозданный коммит"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ новоÑозданный коммит"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "отделённый HEAD"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "не выводить Ñводку поÑле уÑпешного коммита"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "добавить ÑпиÑок изменений в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Опции ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "прочитать Ñообщение из файла"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "Ñообщение"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "Ñообщение коммита"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "коммит"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "иÑпользовать и отредактировать Ñообщение от указанного коммита"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "иÑпользовать Ñообщение указанного коммита"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторÑтвом (Ñ Ð¸Ñпользованием -C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "добавить Signed-off-by:"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "иÑпользовать указанный файл шаблона"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "по-умолчанию"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "как удалÑÑ‚ÑŒ пробелы и #комментарии из ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "включить ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ„Ð°Ð¹Ð»Ð¾Ð² в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "подпиÑать коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Опции Ñодержимого коммита"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "закоммитить вÑе измененные файлы"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "пропуÑтить перехватчик перед-коммитом"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "иÑправить предыдущий коммит"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "пропуÑтить перехватчик поÑле-перезапиÑи"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "разрешить запиÑÑŒ пуÑтого коммита"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "разрешить запиÑÑŒ изменений Ñ Ð¿ÑƒÑтым Ñообщением"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "не удалоÑÑŒ разобрать HEAD коммит"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "не удалоÑÑŒ прочитать MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалоÑÑŒ открыть Ñообщение коммита: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Отмена коммита; вы не изменили Ñообщение.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пуÑтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5493,7 +5715,7 @@ msgstr "показать иÑточник наÑтройки (файл, Ñтан
msgid "unable to parse default color value"
msgstr "не удалоÑÑŒ разобрать значение цвета по умолчанию"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5503,7 +5725,7 @@ msgid ""
"#\temail = %s\n"
msgstr "# Это файл конфигурации Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Git.\n[user]\n# ПожалуйÑта, адаптируйте и раÑкомментируйте Ñледующие Ñтроки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалоÑÑŒ Ñоздать файл конфигурации %s"
@@ -5539,7 +5761,7 @@ msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° %s не Ñодержит вÑÑ‚Ñ
msgid "tag '%s' is really '%s' here"
msgstr "метка «%s» уже здеÑÑŒ «%s»"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s"
@@ -5626,9 +5848,9 @@ msgstr "раÑÑматривать поÑледние <n> меток (по умÐ
msgid "only consider tags matching <pattern>"
msgstr "раÑÑматривать только метки по <шаблону>"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
-msgstr "еÑли не найдено, показать Ñокращенный номер ревизии коммита"
+msgstr "еÑли не найдено, показать Ñокращенный номер редакции коммита"
#: builtin/describe.c:411
msgid "mark"
@@ -5660,21 +5882,21 @@ msgstr "«%s»: не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом или ÑимÐ
msgid "invalid option: %s"
msgstr "неправильный параметр: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Ðе ÑвлÑетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸ÐµÐ¼ git"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "передан неправильный объект «%s»."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "передано больше двух двоичных объектов: «%s»"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "передан необработанный объект «%s»."
@@ -5747,19 +5969,19 @@ msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <гру
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<опции>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "извлечь Ñо вÑех внешних репозиториев"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "допиÑать к .git/FETCH_HEAD вмеÑто перезапиÑи"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "путь к программе упаковки пакета на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ локальной ветки"
@@ -5767,7 +5989,7 @@ msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ локальной вÐ
msgid "fetch from multiple remotes"
msgstr "извлечь Ñ Ð½ÐµÑкольких внешних репозиториев"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "извлечь вÑе метки и ÑвÑзанные объекты"
@@ -5779,19 +6001,19 @@ msgstr "не извлекать вÑе метки (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "количеÑтво подмодулей, которые будут Ñкачаны парралельно"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "почиÑтить отÑлеживаемые внешние ветки, которых уже нет на внешнем репозитории"
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "по требованию"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "управление рекурÑивным извлечением подмодулей"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "оÑтавить загруженный пакет данных"
@@ -5799,15 +6021,15 @@ msgstr "оÑтавить загруженный пакет данных"
msgid "allow updating of HEAD ref"
msgstr "разрешить обновление ÑÑылки HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "Ð³Ð»ÑƒÐ±Ð¾ÐºÐ°Ñ Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ñ Ñ‡Ð°Ñтичного клона"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "преобразовать в полный репозиторий"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "каталог"
@@ -5819,15 +6041,15 @@ msgstr "приÑоединÑÑ‚ÑŒ Ñто Ñпереди к выводу путеÐ
msgid "default mode for recursion"
msgstr "режим по умолчанию Ð´Ð»Ñ Ñ€ÐµÐºÑƒÑ€Ñии"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "принимать ÑÑылки, которые обновлÑÑŽÑ‚ .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "ÑоответÑтвие-ÑÑылок"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "указать ÑоответÑтвие ÑÑылок при извлечении"
@@ -5885,11 +6107,6 @@ msgstr "принудительное обновление"
msgid "(non-fast-forward)"
msgstr "(без перемотки вперед)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "не удалоÑÑŒ открыть %s: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6084,55 +6301,55 @@ msgstr "Проверка ÑоединениÑ"
msgid "Checking object directories"
msgstr "Проверка каталогов объектов"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<опции>] [<объект>…]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "показать недоÑтупные объекты"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "показать объекты, на которые нет ÑÑылок"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "вывеÑти отчет по меткам"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "вывеÑти отчет по корневым узлам"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "воÑпринимать объекты в индекÑе как корневые узлы"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "Ñоздать корневые узлы журналов ÑÑылок (по умолчанию)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "также проверÑÑ‚ÑŒ пакеты и альтернативные объекты"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "только проверить Ñоединение"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "иÑпользовать более Ñтрогую проверку"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "запиÑать объекты на которые нет ÑÑылок в .git/lost-found"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Проверка объектов"
@@ -6227,214 +6444,214 @@ msgstr "не удалоÑÑŒ прочитать дерево (%s)"
msgid "unable to grep from object of type %s"
msgstr "не удалоÑÑŒ выполнить grep из объекта типа %s"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "параметр «%c» ожидает чиÑловое значение"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "не удалоÑÑŒ открыть «%s»"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "иÑкать в индекÑе, а не в рабочем каталоге"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "иÑкать в Ñодержимом не управлÑемым git"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "иÑкать и в отÑлеживаемых, и в неотÑлеживаемых файлах"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "иÑкать в неÑовпадающих Ñтроках"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "без учета региÑтра"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° только на границах Ñлов"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текÑта"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "не иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° в двоичных файлах"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "обрабатыватьÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ðµ файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ фильтров textconv"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "на глубине макÑиму <глубина> уровней"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "иÑпользовать раÑширенные регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "иÑпользовать базовые регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX (по умолчанию)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фикÑированные Ñтроки"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "иÑпользовать Perl-ÑовмеÑтимые регулÑрные выражениÑ"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "вывеÑти номера Ñтрок"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов отноÑительно каталога репозиториÑ"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не Ñовпадающие Ñтроки"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "Ñиноним Ð´Ð»Ñ --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "выводить только неÑовпадающие имена файлов"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "выводить двоичный ÐОЛЬ поÑле ÑпиÑка имен файлов"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "выводить количеÑтво Ñовпадений, а не Ñовпадающие Ñтроки"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "подÑвечивать ÑовпадениÑ"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "выводить пуÑтую Ñтроку поÑле Ñовпадений из разных файлов"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr "выводить Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° только раз на неÑколько Ñовпадений в одном файле"
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "показать <n> Ñтрок контекÑта перед и поÑле ÑовпадениÑ"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "показать <n> Ñтрок контекÑта перед Ñовпадением"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "показать <n> Ñтрок контекÑта поÑле ÑовпадениÑ"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "иÑпользовать <кол> рабочих потоков"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "показать Ñтроку Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ функции перед Ñовпадением"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "поиÑк ÑоответÑтвий Ñ <шаблоном>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -e"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на Ñовпадение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кода выхода"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr "показать только ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð· файлов в которых Ñовпадают вÑе шаблоны"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "показать Ñовпадающие файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программы-пейджера"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируетÑÑ Ð² Ñтой Ñборке)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "не задан шаблон."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "указано неправильное количеÑтво потоков (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --no-index."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ ревизии."
+msgstr "--no-index или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ редакции."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard не может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ñлеживаемого Ñодержимого."
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "указано одновременно --cached и дерево."
@@ -6521,8 +6738,8 @@ msgstr "верÑÐ¸Ñ emacsclient «%d» Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "Ñбой при запуÑке «%s»: %s"
+msgid "failed to exec '%s'"
+msgstr "Ñбой при запуÑке «%s»"
#: builtin/help.c:205
#, c-format
@@ -6780,15 +6997,19 @@ msgstr "Ð±ÐµÐ·ÑƒÐ¼Ð½Ð°Ñ Ð¿ÑƒÑ‚Ð°Ð½Ð¸Ñ†Ð°"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "завершено Ñ %d локальными объектами"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "завершено Ñ %d локальным объектом"
+msgstr[1] "завершено Ñ %d локальными объектами"
+msgstr[2] "завершено Ñ %d локальными объектами"
+msgstr[3] "завершено Ñ %d локальными объектами"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма в конце %s (диÑк поврежден?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -6797,59 +7018,59 @@ msgstr[1] "пакет Ñодержит %d неразрешенные дельтÑ
msgstr[2] "пакет Ñодержит %d неразрешенных дельт"
msgstr[3] "пакет Ñодержит %d неразрешенных дельт"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñжать приÑоединенный объект (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "локальный объект %s поврежден"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "ошибка при закрытии файла пакета"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "не удалоÑÑŒ запиÑать файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "не удалоÑÑŒ закрыть запиÑанный файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "не удалоÑÑŒ Ñохранить файл пакета"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "не удалоÑÑŒ Ñохранить файл индекÑа"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "плохой pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "нет поддержки потоков, игнорирование %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл пакета «%s»"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл индекÑа Ð´Ð»Ñ Â«%s»"
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -6858,7 +7079,7 @@ msgstr[1] "не дельты: %d объекта"
msgstr[2] "не дельты: %d объектов"
msgstr[3] "не дельты: %d объектов"
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1596
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -6867,26 +7088,26 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
msgstr[2] "длина цепочки = %d: %lu объектов"
msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/index-pack.c:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð° «%s» не оканчиваетÑÑ Ð½Ð° «.pack»"
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "Ðе удалоÑÑŒ вернутьÑÑ Ð² текущий рабочий каталог"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "плохой %s"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без --stdin"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð° «%s» не оканчиваетÑÑ Ð½Ð° «.pack»"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ файла пакета"
@@ -6925,27 +7146,27 @@ msgstr "не удалоÑÑŒ Ñкопировать файл «%s» в «%s»"
msgid "ignoring template %s"
msgstr "игнорирование шаблона %s"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "шаблоны не найдены %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "не копирую шаблоны в неправильной верÑии формата %d из «%s»"
+msgid "not copying templates from '%s': %s"
+msgstr "не копирую шаблоны из «%s»: %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s уже ÑущеÑтвует"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "не удаетÑÑ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ файл типа %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s"
@@ -6953,55 +7174,55 @@ msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s репозиторий Git в %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "ÐŸÐµÑ€ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑущеÑтвующего"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "Инициализирован пуÑтой"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " общий"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доÑтупа>]] [<каталог>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "права-доÑтупа"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "укажите, еÑли репозиторий git будет иÑпользоватьÑÑ Ð½ÐµÑколькими пользователÑми"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "не удалоÑÑŒ выполнить mkdir %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "не удалоÑÑŒ выполнить chdir в %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, 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:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Ðе удалоÑÑŒ получить доÑтуп к рабочему каталогу «%s»"
@@ -7045,274 +7266,317 @@ msgstr "git show [<опции>] <объект>…"
msgid "invalid --decorate option: %s"
msgstr "неправильный параметр Ð´Ð»Ñ --decorate: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "не выводить различиÑ"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "показать иÑточник"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "ИÑпользовать файл ÑоответÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… адреÑов"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "опции формата вывода ÑÑылок"
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr "Обработать диапазон Ñтрок n,m из файла, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1"
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Финальный вывод: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: плохой файл"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Ðе удалоÑÑŒ прочитать объект %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "ÐеизвеÑтный тип объекта: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "в format.headers не указано значение"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ каталога"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Ðу удалоÑÑŒ открыть файл изменений %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "Ðужен только один диапазон."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Ðе ÑвлÑетÑÑ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¾Ð¼."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "Сопроводительное пиÑьмо должно быть в формате Ñлектронной почты"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начинаÑ-Ñ> | <диапазон-редакций>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Два выходных каталога?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "ÐеизвеÑтный коммит %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Ðе удалоÑÑŒ разрешить «%s» как ÑÑылку."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Ðе удалоÑÑŒ найти точную базу ÑлиÑниÑ."
+
+#: builtin/log.c:1235
+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 "Ðе удалоÑÑŒ получить вышеÑтоÑщую ветку. ЕÑли вы хотите запиÑать базовый коммит автомитичеÑки, то иÑпользуйте git branch --set-upstream-to Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "Ðе удалоÑÑŒ найти точную базу ÑлиÑниÑ"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "базовый коммит должен быть предком ÑпиÑка редакций"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "базовый коммит не должен быть в ÑпиÑке редакций"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "не удалоÑÑŒ получить идентификатор патча"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "выводить [PATCH] даже когда неÑколько патчей"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "выводить патчи на Ñтандартный вывод"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "генерировать Ñопроводительное пиÑьмо"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "иÑпользовать проÑтую поÑледовательноÑÑ‚ÑŒ чиÑел Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ выходных файлов"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "ÑуффикÑ"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "иÑпользовать ÑÑƒÑ„Ñ„Ð¸ÐºÑ <ÑуффикÑ> вмеÑто «.patch»"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "начать нумерацию патчей Ñ <n>, а не Ñ 1"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "пометить Ñерию как Ñнную попытку"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "ИÑпользовать [<префикÑ>] вмеÑто [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "Ñохранить результирующие файлы в <каталог>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "не обрезать/добавлÑÑ‚ÑŒ [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "не выводить двоичные различиÑ"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "выводить нулевую Ñ…Ñш-Ñумму в заголовке From"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, еÑли коммит уже еÑÑ‚ÑŒ в вышеÑтоÑщей ветке"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в Ñтандартном (патч + ÑтатиÑтика)"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "Передача Ñообщений"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "добавить заголовок ÑообщениÑ"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "почта"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "уÑтановить Ð°Ð´Ñ€ÐµÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ Ð½Ð° <идентификатор> (или на идентификатор коммитера, еÑли отÑутÑтвует)"
-#: builtin/log.c:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "идентификатор-ÑообщениÑ"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "Ñделать первое пиÑьмо ответом на <идентификатор-ÑообщениÑ>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "включить патч в текÑÑ‚ пиÑьма"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в пиÑьмах иерархичноÑÑ‚ÑŒ, Ñтили: shallow (чаÑтичную), deep (глубокую)"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "подпиÑÑŒ"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "добавить подпиÑÑŒ"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "базовый коммит"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "добавить информацию о требовании дерева к Ñерии патчей"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "добавить подпиÑÑŒ из файла"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only не имеет ÑмыÑла"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status не имеет ÑмыÑла"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check не имеет ÑмыÑла"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "Ñтандартный вывод или каталог?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Ðе удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалоÑÑŒ прочитать файл подпиÑи «%s»"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Сбой при Ñоздании выходных файлов"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<вышеÑтоÑщаÑ-ветка> [<голова> [<ограничение>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
"manually.\n"
msgstr "Ðе удалоÑÑŒ найти отÑлеживаемую внешнюю ветку, укажите <вышеÑтоÑщую-ветку> вручную.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "ÐеизвеÑтный коммит %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<опции>] [<файл>…]"
@@ -7500,170 +7764,174 @@ msgstr "git merge [<опции>] <Ñообщение> HEAD <коммит>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "при указании параметра «m» требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ значение"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Ðе удалоÑÑŒ найти Ñтратегию ÑлиÑÐ½Ð¸Ñ Â«%s».\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "ДоÑтупные Ñтратегии:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "ДоÑтупные пользовательÑкие Ñтратегии:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "не выводить ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ"
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "вывеÑти ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(Ñиноним Ð´Ð»Ñ --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "добавить (макÑимум <n>) запиÑей из короткого журнала в Ñообщение коммита у ÑлиÑниÑ"
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "Ñоздать один коммит, вмеÑто Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "Ñделать коммит, еÑли ÑлиÑние прошло уÑпешно (по умолчанию)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "отредактировать Ñообщение перед выполнением коммита"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "разрешить перемотку вперед (по умолчанию)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "отменить выполнение ÑлиÑниÑ, еÑли перемотка вперед невозможна"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "Проверить, что указанный коммит имеет верную Ñлектронную подпиÑÑŒ GPG"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "ÑтратегиÑ"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑниÑ"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "опциÑ=значение"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "опции Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ñтратегии ÑлиÑниÑ"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "Ñообщение коммита Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ (Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ Ð±ÐµÐ· перемотки вперед)"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "отменить выполнение проиÑходÑщего ÑлиÑниÑ"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "разрешить ÑлиÑние неÑвÑзанных иÑторий изменений"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "не удалоÑÑŒ выполнить stash."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "Ñбой при выполнении stash"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "неправильный объект: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "Ñбой при выполнении read-tree"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (нечего уплотнÑÑ‚ÑŒ)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Уплотнение коммита — не обновлÑÑ HEAD\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Ðе удалоÑÑŒ запиÑать в «%s»"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "ЗапиÑÑŒ SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Завершение SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Ðет ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ â€” не обновлÑем HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» не указывает на коммит"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока branch.%s.mergeoptions: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "Ðе обрабатываю ничего, кроме ÑлиÑÐ½Ð¸Ñ Ð´Ð²ÑƒÑ… указателей на ветки."
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "ÐеизвеÑтный параметр merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "не удалоÑÑŒ запиÑать %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ из «%s»"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Ðе выполнÑÑŽ коммит ÑлиÑниÑ; иÑпользуйте «git commit» Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ ÑлиÑниÑ.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7673,157 +7941,161 @@ msgid ""
"the commit.\n"
msgstr "ПожалуйÑта, введите Ñообщение коммита, Ð´Ð»Ñ Ð¾Ð±ÑŠÑÑнениÑ, зачем нужно\nÑто ÑлиÑние, оÑобенно, еÑли Ñто ÑлиÑние обновленной вышеÑтоÑщей\nветки в тематичеÑкую ветку.\n\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое\nÑообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "ПуÑтое Ñообщение коммита."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "ПрекраÑно.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Ðе удалоÑÑŒ провеÑти автоматичеÑкое ÑлиÑние; иÑправьте конфликты и Ñделайте коммит результата.\n"
-#: builtin/merge.c:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "«%s» не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "Ðет текущей ветки."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "У текущей ветки нет внешнего репозиториÑ."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "Ð”Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки не указана вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° по умолчанию."
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ðе указана внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° Ð´Ð»Ñ %s на %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "не удалоÑÑŒ закрыть «%s»"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ðет ÑлиÑниÑ, которое можно отменить (отÑутÑтвует файл MERGE_HEAD)."
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
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:1230
+#: builtin/merge.c:1242
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:1233
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Ð’Ñ‹ не завершили отбор лучшего (приÑутÑтвует файл CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --squash и --no-ff."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Коммит не указан и параметр merge.defaultToUpstream не уÑтановлен."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "Уплотнение коммита в пуÑтую ветку еще не поддерживаетÑÑ"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Коммит, не ÑвлÑющийÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚ÐºÐ¾Ð¹ вперед, нет ÑмыÑла делать в пуÑтую ветку."
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
msgstr "Можно только один коммит в пуÑтую ветку."
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Коммит %s Ñодержит не доверенную GPG подпиÑÑŒ, предположительно от %s."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Коммит %s Ñодержит плохую GPG подпиÑÑŒ, предположительно от %s."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Коммит %s не Ñодержит GPG подпиÑÑŒ."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Коммит %s Ñодержит дейÑтвительную GPG подпиÑÑŒ, от %s.\n"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "отказ ÑлиÑÐ½Ð¸Ñ Ð½ÐµÑвÑзанных иÑторий изменений"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновление %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Попытка тривиального ÑлиÑÐ½Ð¸Ñ Ð² индекÑе…\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Ðе вышло.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "Перемотка вперед невозможна, отмена."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Перемотка дерева к иÑходному ÑоÑтоÑнию…\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Попытка ÑлиÑÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s…\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ðи одна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð½Ðµ обработала ÑлиÑние.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Сбой при ÑлиÑнии Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "ИÑпользую %s Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ¸ ручного Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "ÐвтоматичеÑкое ÑлиÑние прошло уÑпешно; как и запрашивали, оÑтановлено перед выполнением коммита\n"
@@ -7858,7 +8130,7 @@ msgstr "вывеÑти предков Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ многоходово
#: builtin/merge-base.c:218
msgid "list revs not reachable from others"
-msgstr "вывеÑти ÑпиÑок ревизий, которые не доÑтижимы из друг друга"
+msgstr "вывеÑти ÑпиÑок редаций, которые не доÑтижимы из друг друга"
#: builtin/merge-base.c:220
msgid "is the first one ancestor of the other?"
@@ -7931,7 +8203,7 @@ msgstr "git mv [<опции>] <иÑточник>… <назначение>"
msgid "Directory %s is in index and no submodule?"
msgstr "Каталог %s в индекÑе и не ÑвлÑетÑÑ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "Чтобы продолжить, проиндекÑируйте или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² файле .gitmodules"
@@ -8009,48 +8281,48 @@ msgstr "%s, откуда=%s, куда=%s"
msgid "Renaming %s to %s\n"
msgstr "Переименование %s в %s\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "Ñбой при переименовании «%s»"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<опции>] <коммит>…"
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<опции>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<опции>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "выводить только имена (без SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "иÑпользовать только метки Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð²"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "иÑпользовать только ÑÑылки, ÑоответÑтвующие <шаблону> "
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "вывеÑти ÑпиÑок вÑех коммитов, доÑтижимых Ñо вÑех ÑÑылок"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "прочитать из Ñтандартного ввода"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "разрешить вывод «undefined», еÑли не найдено (по умолчанию)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "разыменовывать введенные метки (Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ иÑпользованиÑ)"
@@ -8191,24 +8463,16 @@ msgstr "не удалоÑÑŒ запиÑать объект заметки"
msgid "The note contents have been left in %s"
msgstr "Содержимое заметки оÑталоÑÑŒ в %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "не удалоÑÑŒ прочитать «%s»"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалоÑÑŒ открыть или прочитать «%s»"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Ðе удалоÑÑŒ разрешить «%s» как ÑÑылку."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8221,7 +8485,7 @@ msgstr "Ðе удалоÑÑŒ прочитать данные заметки из
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "передано Ñлишком много параметров"
@@ -8266,7 +8530,7 @@ msgstr "Ðе удалоÑÑŒ добавить заметку. Ðайдена Ñу
msgid "Overwriting existing notes for object %s\n"
msgstr "ПерезапиÑÑŒ ÑущеÑтвующих заметок у объекта %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Удаление заметки у объекта %s\n"
@@ -8302,63 +8566,63 @@ msgid ""
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr "Опции -m/-F/-c/-C Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ «edit» уÑтарели.\nИÑпользуйте вмеÑто них «git notes add -f -m/-F/-c/-C».\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Общие опции"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Опции ÑлиÑниÑ"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
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:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "Коммит не Ñлитых заметок"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr "завершить ÑлиÑние заметок коммитом не Ñлитых заметок"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "Отмена Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑ‚Ð¾Ðº"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "отменить ÑлиÑние заметок"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "СлиÑние заметок в %s уже выполнÑетÑÑ Ð½Ð° %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "У объекта %s нет заметки\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "попытка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÑущеÑтвующей заметки не ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "прочитать имена объектов из Ñтандартного ввода"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "ÑÑылка-на-заметку"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "иÑпользовать заметку из <ÑÑылка-на-заметку>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
@@ -8378,165 +8642,169 @@ msgstr "git pack-objects [<опции>…] <имÑ-базы> [< <ÑпиÑок-Ñ
msgid "deflate error (%d)"
msgstr "ошибка ÑÐ¶Ð°Ñ‚Ð¸Ñ (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "отключение запиÑи битовых карт, так как карты были разбиты на чаÑти из-за pack.packSizeLimit"
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr "ЗапиÑÑŒ объектов"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "отключение запиÑи битовых карт, так как некоторые объекты не были упакованы"
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "Сжатие объектов"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа «%s»"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿Ð¸Ñи объектов"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "похоже на --all-progress при включенном прогреÑÑе выполнениÑ"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "верÑиÑ[,Ñмещение]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr "запиÑать файл индекÑа пакета в указанной верÑии формата"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "макÑимальный размер каждого выходного файла пакета"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "игнорировать чужие объекты, взÑтые из альтернативного хранилища объектов"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "игнорировать упакованные объекты"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "ограничить окно пакета по количеÑтву объектов"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr "дополнительно к количеÑтву объектов ограничить окно пакета по памÑти"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° цепочки дельт в результирующем пакете"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "иÑпользовать повторно ÑущеÑтвующие дельты"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "иÑпользовать повторно ÑущеÑтвующие объекты"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "иÑпользовать объекты OFS_DELTA"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr "иÑпользовать многопоточноÑÑ‚ÑŒ при поиÑке лучших Ñовпадений дельт"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "не Ñоздавать пуÑтые выходные пакеты"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "прочитать аргументы редакций из Ñтандартного ввода"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "ограничитьÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°Ð¼Ð¸, которые еще не упакованы"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "включить объекты, которые доÑтижимы по любой из ÑÑылок"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "включить объекты, на которые ÑÑылаютÑÑ Ð·Ð°Ð¿Ð¸Ñи журнала ÑÑылок"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "включить объекты, на которые ÑÑылаетÑÑ Ð¸Ð½Ð´ÐµÐºÑ"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "вывеÑти пакет на Ñтандартный вывод"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr "включить объекты меток, которые ÑÑылаютÑÑ Ð½Ð° упаковываемые объекты"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "ÑохранÑÑ‚ÑŒ ÑÑылки на недоÑтупные объекты"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "времÑ"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "раÑпаковать недоÑтупные объекты, которые новее, чем <времÑ>"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "Ñоздавать тонкие пакеты"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "Ñоздавать пакеты, подходÑщие Ð´Ð»Ñ Ñ‡Ð°Ñтичных извлечений"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "игнорировать пакеты, Ñ€Ñдом Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ лежит .keep файл"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "не Ñкрывать коммиты ÑращениÑми"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr "по возможноÑти иÑпользовать Ð¸Ð½Ð´ÐµÐºÑ Ð² битовых картах, Ð´Ð»Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñчета объектов"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "запиÑÑŒ индекÑа в битовых картах вмеÑте Ñ Ð¸Ð½Ð´ÐµÐºÑом пакета"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "ПодÑчет объектов"
@@ -8564,15 +8832,15 @@ msgstr "Удаление дублирующихÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <времÑ>] [--] [<имÑ-ветки>…]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "не удалÑÑ‚ÑŒ, только показать ÑпиÑок"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "вывеÑти ÑпиÑок удаленных объектов"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "удалить объекты Ñтарее чем <дата-окончаниÑ>"
@@ -8584,65 +8852,69 @@ msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ñ‡Ð¸Ñтить неиÑпользуемые объекÑ
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<опции>] [<репозиторий> [<ÑпецификациÑ-ÑÑылки>…]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Опции, ÑвÑзанные Ñо ÑлиÑнием"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "забрать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ перебазированиÑ, а не ÑлиÑниÑ"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "разрешить перемотку вперед"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверить, что указанный коммит имеет верную Ñлектронную подпиÑÑŒ GPG"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "автоматичеÑки выполнÑÑ‚ÑŒ stash/stash pop до и поÑле перемещениÑ"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Опции, ÑвÑзанные Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸ÐµÐ¼ изменений"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "количеÑтво подмодулей, которые будут получены парралельно"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ðеправильное значение Ð´Ð»Ñ pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Ðе удалоÑÑŒ получить Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸ÐµÐ¼: У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ непроиндекÑированные изменениÑ."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "К тому же, в вашем индекÑе еÑÑ‚ÑŒ незакоммиченные изменениÑ."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Ðе удалоÑÑŒ получить Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸ÐµÐ¼: Ð’ вашем индекÑе еÑÑ‚ÑŒ незакоммиченные изменениÑ."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Ðет претендентов Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñреди ÑÑылок, которые вы только что получили."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Ðет претендентов Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ Ñреди ÑÑылок, которые вы только что получили."
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "Обычно Ñто означает, что вы передали Ñпецификацию ÑÑылки Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ шаблона и Ñтот шаблон ни Ñ Ñ‡ÐµÐ¼ не Ñовпал на внешнем репозитории."
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -8650,46 +8922,57 @@ msgid ""
"for your current branch, you must specify a branch on the command line."
msgstr "Ð’Ñ‹ попроÑили получить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñо внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s», но не указали ветку. Так как Ñто не репозиторий по умолчанию Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ текущей ветки, вы должны указать ветку в командной Ñтроке."
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток."
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "ПожалуйÑта, укажите на какую ветку вы хотите перемеÑтить изменениÑ."
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "ПожалуйÑта, укажите Ñ ÐºÐ°ÐºÐ¾Ð¹ веткой вы хотите Ñлить изменениÑ."
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите git-pull(1)."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<внешний-репозиторий>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ветка>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "У текущей ветки нет информации об отÑлеживании."
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
-msgstr "ЕÑли вы хотите указать информацию о отÑлеживаемой ветке, выполните:\n\n git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "ЕÑли вы хотите указать информацию о отÑлеживаемой ветке, выполните:"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr "Ваша ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚, что нужно Ñлить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñо ÑÑылкой\n«%s» из внешнего репозиториÑ, но Ñ‚Ð°ÐºÐ°Ñ ÑÑылка не была получена."
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash можно иÑпользовать только вмеÑте Ñ --rebase."
+
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновление еще не начавшейÑÑ Ð²ÐµÑ‚ÐºÐ¸ Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñми, добавленными в индекÑ."
-#: builtin/pull.c:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -8697,7 +8980,7 @@ msgid ""
"commit %s."
msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -8708,11 +8991,11 @@ msgid ""
"to recover."
msgstr "Ðе удалоÑÑŒ перемотать вперёд Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² вашем рабочем каталоге.\nПоÑле того, как вы убедитеÑÑŒ, что вы Ñохранили вÑÑ‘ необходимое из вывода\n$ git diff %s\n, запуÑтите\n$ git reset --hard\nÐ´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ñходного ÑоÑтоÑниÑ."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñлить неÑколько веток в пуÑтой указатель на ветку."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Ðевозможно перемеÑтить над неÑколькими ветками."
@@ -9011,12 +9294,24 @@ msgstr "не обновлÑÑ‚ÑŒ Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ рабочий каталоÐ
#: builtin/read-tree.c:137
msgid "skip applying sparse checkout filter"
-msgstr "пропуÑтить применение фильтра чаÑтичного перехода"
+msgstr "пропуÑтить применение фильтра чаÑтичного Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° ÑоÑтоÑние"
#: builtin/read-tree.c:139
msgid "debug unpack-trees"
msgstr "отладка unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <каталог-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "тихий режим"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Вы должны указать каталог."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9330,26 +9625,28 @@ msgstr "* внешний репозиторий %s"
msgid " Fetch URL: %s"
msgstr " URL Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(нет URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " URL Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ñ‹Ð¹, может быть одним из):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -9358,11 +9655,11 @@ msgstr[1] " Внешние ветки:%s"
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ запрошен)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ°, наÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Â«git pull»:"
@@ -9370,11 +9667,11 @@ msgstr[1] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git
msgstr[2] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:"
msgstr[3] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:"
-#: builtin/remote.c:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ÑÑылки, зеркалируемые Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git push»"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -9383,128 +9680,128 @@ msgstr[1] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«gi
msgstr[2] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:"
msgstr[3] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:"
-#: builtin/remote.c:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "уÑтановить refs/remotes/<имÑ>/HEAD в завиÑимоÑти от внешнего репозиториÑ"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имÑ>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Ðе удалоÑÑŒ определить внешний HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "ÐеÑколько внешних HEAD веток. Укажите Ñвно одну из них:"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Ðе удалоÑÑŒ удалить %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Ðе удалоÑÑŒ наÑтроить %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет виÑÑщей веткой!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s Ñтала виÑÑщей веткой!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Удаление %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "почиÑтить внешние репозитории поÑле извлечениÑ"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "запроÑить URL отправки, вмеÑто URL извлечениÑ"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "вернуть вÑе URL"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не наÑтроены Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --delete"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Ðеправильный шаблон Ñтарого URL: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Ðе найдены ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ URL: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ вÑе URL не-отправки"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многоÑловнее; должно ÑтоÑÑ‚ÑŒ перед подкомандой"
@@ -9998,10 +10295,6 @@ msgstr "разрешить рекурÑивное удаление"
msgid "exit with a zero status even if nothing matched"
msgstr "выход Ñ Ð½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ кодом возврата, даже еÑли ничего не найдено"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "ПожалуйÑта, проиндекÑируйте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² .gitmodules или ÑпрÑчьте их, чтобы продолжить"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10192,80 +10485,178 @@ msgstr "пропуÑтить и удалить вÑе Ñтроки, начина
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой Ñтрокой Ñимвол ÐºÐ¾Ð¼Ð¼ÐµÑ‚Ð°Ñ€Ð¸Ñ Ð¸ пробел"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Ðет такой ÑÑылки: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "ОжидалоÑÑŒ полное Ð¸Ð¼Ñ ÑÑылки, а получено %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "не удалоÑÑŒ обрезать один компонент url «%s»"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "альтернативный Ñимвол Ð´Ð»Ñ Ð¾Ñ‚Ð½Ð¾Ñительных путей"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "URL Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «%s» не найден в .gitmodules"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Сбой региÑтрации адреÑа Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Подмодуль «%s» (%s) зарегиÑтрирован по пути «%s»\n"
+
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "внимание: предполагаемый режим Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Сбой региÑтрации режима Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Ðе выводить информацию о инициализации подмодулÑ"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<путь>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <путь>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "не найдено ÑоответÑтвие подмодулей в .gitmodules Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»"
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть Ñклонирован новый подмодуль"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ подмодулÑ"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "url откуда должен был Ñклонирован новый подмодуль"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "глубина Ð´Ð»Ñ Ñ‡Ð°Ñтичного клона"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] "
-"[<path>...]"
-msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имÑ>] [--url <url>][--depth <глубина>] [--] [<путь>…]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имÑ>] [--depth <глубина>] --url <url> --path <путь>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "не удалоÑÑŒ клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "не удалоÑÑŒ открыть файл «%s»"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "не удалоÑÑŒ закрыть файл %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "не удалоÑÑŒ получить каталог Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»"
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: подкоманда submodule--helper должна вызыватьÑÑ Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ подкоманды"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Подмодуль по пути «%s» не инициализирован"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Возможно, вы хотели иÑпользовать «update --init»?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "ПропуÑк не Ñлитого Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:660
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: «%s» не ÑвлÑетÑÑ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ submodule--helper"
+msgid "Skipping submodule '%s'"
+msgstr "ПропуÑк Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "путь в рабочем каталоге"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "путь в рабочем каталоге, в пределах границ подмодулÑ"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout или none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Создать чаÑтичный клон, ограниченный указанным количеÑтвом редакций"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "параллельные задачи"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "вы выводить прогреÑÑ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "плохое значение Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "подкоманда submodule--helper должна вызыватьÑÑ Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ подкоманды"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "«%s» не ÑвлÑетÑÑ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10315,27 +10706,22 @@ msgstr "git tag -l [-n[<количеÑтво>]] [--contains <коммит>] [--p
msgid "git tag -v <tagname>..."
msgstr "git tag -v <имÑ-метки>…"
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð¼ÐµÑ‚ÐºÐ¸: %.*s…"
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "не удалоÑÑŒ проверить метку «%s»"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10344,7 +10730,7 @@ msgid ""
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10470,21 +10856,21 @@ msgstr "опции --merged и --no-merged можно иÑпользовать Ñ
msgid "only one -F or -m option is allowed."
msgstr "-F и -m Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "передано Ñлишком много параметров"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем метки."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже ÑущеÑтвует"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
@@ -10732,7 +11118,7 @@ msgstr "git verify-commit [-v | --verbose] <коммит>…"
msgid "print commit contents"
msgstr "вывеÑти Ñодержимое коммита"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "выводить Ñырой вывод ÑтатуÑа от gpg"
@@ -10752,7 +11138,7 @@ msgstr "вывеÑти только ÑтатиÑтику"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <метка>…"
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "вывеÑти Ñодержимое метки"
@@ -10768,68 +11154,72 @@ msgstr "git worktree prune [<опции>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<опции>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не ÑущеÑтвует"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалоÑÑŒ прочитать файл gitdir (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недейÑтвительный файл gitdir"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на неÑущеÑтвующее раÑположение"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "не удалоÑÑŒ удалить: %s"
+msgid "failed to remove '%s'"
+msgstr "Ñбой ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Â«%s»"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже ÑущеÑтвует"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалоÑÑŒ Ñоздать каталог «%s»"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготовка %s (идентификатор %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "перейти на <ветка> даже еÑли она уже активна в другом рабочеÑм каталоге"
+msgstr "переключитьÑÑ Ð½Ð° <ветка> даже еÑли она уже активна в другом рабочеÑм каталоге"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "Ñоздать новую ветку"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "Ñоздать или перейти на ветку"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "отÑоединить HEAD на указанном коммите"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "наполнить новый рабочий каталог"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
@@ -10849,7 +11239,7 @@ msgstr "вывеÑти объект дерева Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ñ
msgid "only useful for debugging"
msgstr "иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при отладке"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "вывод отладочных Ñообщений на stderr"
@@ -10860,7 +11250,7 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr "«git help -а» и «git help -g» выводит ÑпиÑок доÑтупных подкоманд и\nнекоторые руководÑтва по темам. ЗапуÑтите «git help <команда>» или\n«git help <термин>», чтобы прочеÑÑ‚ÑŒ о конкретных подкоманде или теме."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning не поддерживаетÑÑ Ñ cURL < 7.44.0"
@@ -10988,7 +11378,7 @@ msgstr "тихий режим"
msgid "use <n> digits to display SHA-1s"
msgstr "иÑпользовать <n> цифр Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° SHA-1"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr "обновить Ð¸Ð½Ð´ÐµÐºÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ переиÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð°, еÑли возможно"
@@ -11180,58 +11570,54 @@ msgid ""
"To check out the original branch and stop rebasing, run \"git rebase --abort\"."
msgstr "Когда вы разрешите Ñтот конфликт, запуÑтите «git rebase --continue».\nЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и оÑтановить перемещение, запуÑтите «git rebase --abort»."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "Применено автоматичеÑкое прÑтанье."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Ðе удалоÑÑŒ Ñохранить $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
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 "Применение автоматичеÑкого прÑÑ‚Ð°Ð½ÑŒÑ Ð²Ñ‹Ð·Ð²Ð°Ð»Ð¾ конфликты.\nВаши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑпрÑтаны и в безопаÑноÑти.\nÐ’Ñ‹ можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Перехватчик пре-Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÐºÐ°Ð·Ð°Ð» в перемещении."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Похоже, git-am выполнÑетÑÑ. Перемещение невозможно."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "ÐžÐ¿Ñ†Ð¸Ñ --exec должна иÑпользоватьÑÑ Ð²Ð¼ÐµÑте Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Ðет Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð² процеÑÑе?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "ДейÑтвие --edit-todo может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при интерактивном перемещении."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Ðе удалоÑÑŒ прочитать HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr "Ð’Ñ‹ должны отредактировать вÑе\nконфликты ÑлиÑниÑ, а потом пометить\nих как разрешенные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ git add"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Ðе удалоÑÑŒ перейти назад на $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11244,64 +11630,64 @@ msgid ""
"valuable there."
msgstr "Похоже, каталог $state_dir_base уже ÑущеÑтвует и Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÑŽ, что вы в процеÑÑе другого перемещениÑ. ЕÑли Ñто так, попробуйте\n\t$cmd_live_rebase\nЕÑли нет\n\t$cmd_clear_stale_rebase\nи запуÑтите Ð¼ÐµÐ½Ñ Ñнова. Я оÑтанавливаюÑÑŒ, чтобы вы не потерÑли что-то важное."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "недейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð²Ñ‹ÑˆÐµÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: имеетÑÑ Ð±Ð¾Ð»ÑŒÑˆÐµ одной базы ÑлиÑниÑ"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: нет базы ÑлиÑниÑ"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ðе указывает на дейÑтвительный коммит: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: нет такой ветки: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Ðе удалоÑÑŒ выполнить автоматичеÑкое прÑтанье"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки ÑпрÑтаны: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Сделайте коммит или ÑпрÑчьте их."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° $branch_name уже ÑвежаÑ, принудительное перемещение."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚ $mb до $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ… него…"
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Перемотана вперед $branch_name до $onto_name."
@@ -11442,26 +11828,21 @@ msgstr "Ðе указано Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸"
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы воÑÑтановить их, наберите «git stash apply»)"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "не удалоÑÑŒ отрезать один компонент адреÑа «$remoteurl»"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "ОтноÑительный путь можно иÑпользовать только находÑÑÑŒ на вершине рабочего каталога"
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозиториÑ: «$repo» должен быть абÑолютным или начинатьÑÑ Ñ ./|../"
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже ÑодержитÑÑ Ð² индекÑе"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11469,235 +11850,217 @@ msgid ""
"Use -f if you really want to add it."
msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n$sm_path\nИÑпользуйте опцию -f, еÑли вы дейÑтвительно хотите его добавить."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "ДобавлÑÑŽ ÑущеÑтвующий репозиторий из «$sm_path» в индекÑ"
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием git"
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "Каталог git Ð´Ð»Ñ Â«$sm_name» найден локально на внешних репозиториÑÑ…:"
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "ЕÑли вы хотите переиÑпользовать локальный каталог git вмеÑто повторного ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð·"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ", то иÑпользуйте опцию «--force». ЕÑли локальный каталог git не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "или еÑли вы не понÑли, что Ñто значит, то проÑто иÑпользуйте другое Ð¸Ð¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ опции «--name»."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "ВоÑÑтановление локального каталога git Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_name»."
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Ðе удалоÑÑŒ перейти на ÑоÑтоÑние у Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»"
+msgstr "Ðе удалоÑÑŒ переключитьÑÑ Ð½Ð° ÑоÑтоÑние у Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Ðе удалоÑÑŒ зарегиÑтрировать подмодуль «$sm_path»"
-#: git-submodule.sh:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Заходим в «$prefix$displaypath»"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "ОÑтанавливаемÑÑ Ð½Ð° «$prefix$displaypath»; Ñценарий вернул не нулевой код возврата."
-
-#: git-submodule.sh:483
+#: git-submodule.sh:355
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "ÐÐ´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» не найден в .gitmodules"
+msgid "Entering '$displaypath'"
+msgstr "Заходим в «$displaypath»"
-#: git-submodule.sh:492
+#: git-submodule.sh:375
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Сбой региÑтрации адреÑе Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "ОÑтанавливаемÑÑ Ð½Ð° «$displaypath»; Ñценарий вернул не нулевой код возврата."
-#: git-submodule.sh:494
+#: git-submodule.sh:448
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Подмодуль «$name» ($url) зарегиÑтрирован Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «$displaypath»"
+msgid "pathspec and --all are incompatible"
+msgstr "Ñпецификацию пути и --all Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно"
-#: git-submodule.sh:511
+#: git-submodule.sh:453
#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "Сбой региÑтрации режима Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "ИÑпользуйте «--all», еÑли вы дейÑтвительно хотите деинициализировать вÑе подмодули"
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "ИÑпользуйте «.», еÑли вы дейÑтвительно хотите деинициализировать вÑе подмодули"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит каталог .git"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(иÑпользуйте «rm -rf», еÑли вы дейÑтвительно хотите удалить его, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²ÑÑŽ его иÑторию)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to"
" discard them"
msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит локальные изменениÑ; иÑпользуйте «-f», чтобы отменить их"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Очищен каталог «$displaypath»"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Ðе удалоÑÑŒ удалить рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Ðе удалоÑÑŒ Ñоздать пуÑтой каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Подмодуль «$name» ($url) был ÑнÑÑ‚ Ñ Ñ€ÐµÐ³Ð¸Ñтрации по пути «$displaypath»"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr "Подмодуль по пути «$displaypath» не инициализирован\nВозможно, вам нужно иÑпользовать «update --init»?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ найти текущую редакцию Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:745
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»"
-#: git-submodule.sh:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Ðе удалоÑÑŒ выполнить переход на ÑоÑтоÑние «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
+msgstr "Ðе удалоÑÑŒ переключитьÑÑ Ð½Ð° ÑоÑтоÑние «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано ÑоÑтоÑние «$sha1»"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ перемеÑтить «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить ÑлиÑние Ñ Â«$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: Ñлито Ñ Â«$sha1»"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "Сбой Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«$command $sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$prefix$sm_path»"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "Сбой Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«$command $sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Подмодуль по пути «$prefix$sm_path»: «$command $sha1»"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --files"
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвеÑтный режим $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_src"
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_dst"
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не Ñодержит коммиты $sha1_src и $sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "двоичный объект"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ url Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите git-${cmd}(1)."
diff --git a/po/sv.po b/po/sv.po
index 32bcaba..e7416af 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 2.8.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-15 22:35+0100\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-27 14:04+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -31,7 +31,7 @@ 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:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
@@ -75,7 +75,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "prefix"
@@ -83,9 +83,9 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -119,7 +119,8 @@ msgstr "komprimera bättre"
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "arkiv"
@@ -271,11 +272,16 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: \"%s\""
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -286,7 +292,7 @@ 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:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -295,10 +301,10 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -337,21 +343,21 @@ msgstr "rev-list dog"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "index-pack dog"
@@ -360,8 +366,8 @@ msgstr "index-pack dog"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -395,21 +401,21 @@ msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
@@ -428,24 +434,27 @@ msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
msgid "%s has multiple values"
msgstr "%s har flera värden"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "kunde inte ställa in \"%s\" till \"%s\""
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Kunde inte ställa in \"%s\" till \"%s\""
+msgid "could not unset '%s'"
+msgstr "kunde inte ta bort inställning för \"%s\""
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "kunde inte skriva till rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "kunde inte skriva till rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "kunde inte stänga rev-list:s standard in: %s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "kunde inte stänga rev-list:s standard in"
#: date.c:95
msgid "in the future"
@@ -520,26 +529,26 @@ msgstr[1] "%lu år sedan"
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -548,16 +557,16 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -566,20 +575,20 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "kunde inte köra gpg."
@@ -593,28 +602,28 @@ msgstr "gpg misslyckades signera data"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "kunde inte skapa temporära filen \"%s\": %s"
+msgid "could not create temporary file '%s'"
+msgstr "kunde inte skapa temporära filen \"%s\""
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "misslyckades skriva fristående signatur till \"%s\": %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "misslyckades skriva fristående signatur till \"%s\""
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "\"%s\": %s"
+msgid "failed to stat '%s'"
+msgstr "misslyckades ta status på \"%s\""
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "\"%s\": kort läsning %s"
+msgid "'%s': short read"
+msgstr "\"%s\": kort läsning"
#: help.c:205
#, c-format
@@ -680,12 +689,37 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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 ""
+"Kunde inte skapa \"%s.lock\": %s.\n"
+"\n"
+"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"
+"ett textredigeringsprogram startat av \"git commit\". Se till att\n"
+"alla processer avslutats och försök sedan igen. Om det fortfarande\n"
+"misslyckas kanske en git-process har kraschat i det här arkivet\n"
+"tidigare:\n"
+"ta bort filen manuellt för att fortsätta."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "kunde inte skapa \"%s.lock\": %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
@@ -732,7 +766,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
@@ -866,7 +900,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "undermodul"
@@ -894,50 +928,50 @@ 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:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Obehandlad sökväg??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, 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:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -967,28 +1001,28 @@ msgstr "Felaktigt värde på %s: \"%s\""
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-TAL"
@@ -997,7 +1031,7 @@ msgstr "-TAL"
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
@@ -1067,7 +1101,7 @@ msgstr ""
"Ingenting att exkludera från med :(exkludera)-mönster.\n"
"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
@@ -1093,23 +1127,23 @@ msgstr ""
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
@@ -1248,93 +1282,93 @@ msgstr "format: atomen %%(end) saknas"
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:745
+#: remote.c:746
#, 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:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1695
+#: remote.c:1696
#, 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:1710
+#: remote.c:1711
#, 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:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2073
+#: remote.c:2074
#, 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:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
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:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1344,11 +1378,11 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2101
+#: remote.c:2102
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:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1363,20 +1397,20 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2114
+#: remote.c:2115
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"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2134
+#: revision.c:2145
#, 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:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
@@ -1427,7 +1461,7 @@ msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Kunde inte skriva till %s"
@@ -1585,12 +1619,12 @@ msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
msgid "Could not create sequencer directory %s"
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
@@ -1602,63 +1636,72 @@ msgstr "kan inte bestämma HEAD"
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:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "kan inte öppna %s: %s"
+msgid "cannot open %s"
+msgstr "kan inte öppna %s"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "kan inte läsa %s: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:888
+#: sequencer.c:887
#, 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:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "Kan inte ångra som första incheckning"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Förväntade git-arkivversion <= %d, hittade %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "okända arkivutökningar hittades:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
@@ -1685,31 +1728,40 @@ msgstr ""
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "ogiltigt värde för %s"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1769,7 +1821,231 @@ msgstr "kunde inte byta nman på temporära file till %s"
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+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:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
+
+#: unpack-trees.c:71
+#, 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"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s"
+"\"."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
+"dem:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+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:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av "
+"sammanslagningen:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"utcheckningen:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%sFlytta eller ta bort dem innan du byter gren."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
+"sammanslagningen:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%sFlytta eller ta bort dem innan du kan \"%s\"."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles "
+"utcheckning:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
+"utcheckning:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Avbryter\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "Checkar ut filer"
@@ -1807,198 +2083,194 @@ msgstr "felaktigt \"..\"-sökvägssegment"
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "kan inte komma åt \"%s\": %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "kunde inte öppna %s för skrivning"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:219
+#: wt-status.c:220
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)"
-#: wt-status.c:221
+#: wt-status.c:222
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)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:236
+#: wt-status.c:237
#, 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)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "programfel: ej hanterad \"unmerged\"-status %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2006,39 +2278,39 @@ msgstr ""
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
@@ -2185,43 +2457,43 @@ 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:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "PÃ¥ grenen "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå"
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2233,32 +2505,32 @@ msgstr ""
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2267,52 +2539,52 @@ msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, 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:1525
+#: wt-status.c:1547
#, 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:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, 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:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "försvunnen"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "efter "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "före "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -2326,7 +2598,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
@@ -2339,7 +2611,7 @@ msgstr "ta bort \"%s\"\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
@@ -2375,14 +2647,14 @@ 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:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
@@ -2390,7 +2662,7 @@ msgstr "var pratsam"
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
@@ -2458,16 +2730,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
@@ -2495,16 +2767,6 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "kunde inte öppna \"%s\" för läsning: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2514,76 +2776,76 @@ msgstr "kunde inte tolka patchen \"%s\""
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:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, 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:1189
+#: builtin/am.c:1188
#, 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:1190
+#: builtin/am.c:1189
#, 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:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
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:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2591,39 +2853,39 @@ msgstr ""
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -2631,35 +2893,35 @@ msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
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:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2669,7 +2931,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:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2677,17 +2939,17 @@ msgstr ""
"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
"Glömde du använda \"git add\"?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2695,152 +2957,154 @@ msgstr ""
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
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:2267
+#: builtin/am.c:2266
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:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "åtgärd"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "rot"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "sökväg"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "antal"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "format"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2848,16 +3112,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:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, 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:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2866,7 +3130,7 @@ msgstr ""
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@ -2899,37 +3163,37 @@ msgstr "regexec returnerade %d för indata: %s"
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2945,77 +3209,77 @@ msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, 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"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3024,319 +3288,329 @@ msgstr ""
"vid sökning efter:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, 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)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, 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"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg: %s"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, 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)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, 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"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, 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"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "internt fel"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "kan inte öppna %s: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Ignorerar patch \"%s\"."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
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"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
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"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
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"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, 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"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3402,99 +3676,99 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
msgid "Blaming lines"
msgstr "Klandra rader"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
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:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
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:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
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:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@ -3504,31 +3778,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3537,7 +3811,7 @@ msgstr ""
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3546,12 +3820,12 @@ msgstr ""
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3560,340 +3834,361 @@ msgstr ""
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: försvunnen]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: bakom %d] "
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[bakom %d] "
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: före %d] "
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[före %d] "
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: före %d, bakom %d] "
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[före %d, bakom %d] "
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** ogiltig ref ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(ingen gren)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Grenen %s ombaseras på %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Grenen %s är i en \"bisect\" på %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "kunde inte skriva grenbeskrivningsmall: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "kunde inte skriva grenbeskrivningsmall"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "uppströms"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "ändra uppströmsinformationen"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3902,7 +4197,7 @@ msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3913,16 +4208,6 @@ msgstr ""
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4021,7 +4306,7 @@ 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:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -4111,8 +4396,9 @@ msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "sträng"
@@ -4162,79 +4448,79 @@ msgstr "sökväg \"%s\": kan inte slå ihop"
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, 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:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, 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:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "indexfilen är trasig"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4257,7 +4543,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4284,151 +4570,151 @@ msgstr[1] ""
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
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:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
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:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
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:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4437,12 +4723,12 @@ msgstr ""
"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, 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:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4595,8 +4881,8 @@ msgstr "städa interaktivt"
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "mönster"
@@ -4636,104 +4922,113 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "antal undermoduler som klonas parallellt"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "klonade undermoduler kommer vara grunda"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4741,57 +5036,52 @@ msgstr ""
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, 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."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "misslyckades ta status på \"%s\""
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4801,129 +5091,129 @@ msgstr ""
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
# Vague original, not networking-related, but rather related to the actual
# objects downloaded.
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Kontrollerar om vi fick alla objekt..."
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
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:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, 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:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -5063,66 +5353,66 @@ msgstr ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:447
+#: builtin/commit.c:449
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:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5130,38 +5420,38 @@ msgstr ""
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "kunde inte läsa MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "kunde inte läsa MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5176,7 +5466,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5191,7 +5481,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5201,7 +5491,7 @@ msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5212,146 +5502,146 @@ 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:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, 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:1055
+#: builtin/commit.c:1066
#, 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:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
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:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
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:1151
+#: builtin/commit.c:1162
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:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
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:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
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:1191
+#: builtin/commit.c:1202
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:1193
+#: builtin/commit.c:1204
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:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5359,201 +5649,201 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
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:1587
+#: builtin/commit.c:1603
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:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5700,7 +5990,7 @@ msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5715,7 +6005,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
@@ -5751,7 +6041,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
@@ -5844,7 +6134,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
@@ -5878,21 +6168,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk"
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
@@ -5965,19 +6255,19 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
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:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
@@ -5985,7 +6275,7 @@ msgstr "tvinga överskrivning av lokal gren"
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
@@ -5997,19 +6287,19 @@ msgstr "hämta inte alla taggar (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
@@ -6017,15 +6307,15 @@ msgstr "behåll hämtade paket"
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "kat"
@@ -6037,15 +6327,15 @@ msgstr "lägg till i början av undermodulens sökvägsutdata"
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
@@ -6103,11 +6393,6 @@ msgstr "tvingad uppdatering"
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "kan inte öppna %s: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6309,57 +6594,57 @@ msgstr "Kontrollerar konnektivitet"
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Kontrollerar objekt"
@@ -6462,214 +6747,214 @@ msgstr "kunde inte läsa träd (%s)"
msgid "unable to grep from object of type %s"
msgstr "Kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
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:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
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:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
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:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index och --untracked kan inte användas med revisioner."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
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:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
@@ -6759,8 +7044,8 @@ msgstr "emacsclient version \"%d\" för gammal (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "exec misslyckades för \"%s\": %s"
+msgid "failed to exec '%s'"
+msgstr "exec misslyckades för \"%s\""
#: builtin/help.c:205
#, c-format
@@ -7018,107 +7303,109 @@ msgstr "förvirrad bortom vanvett"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "slutfördes med %d lokala objekt"
+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:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, 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:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, 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:1587
+#: builtin/index-pack.c:1589
#, 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:1594
+#: builtin/index-pack.c:1596
#, 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:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -7157,27 +7444,27 @@ msgstr "kan inte kopiera \"%s\" till \"%s\""
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "mallarna hittades inte %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
+msgid "not copying templates from '%s': %s"
+msgstr "kopierade inte mallar från \"%s\": %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
@@ -7185,24 +7472,24 @@ msgstr "kan inte flytta %s till %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-arkiv i %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "Ominitierade befintligt"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "Initierade tomt"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " delat"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7210,25 +7497,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7237,7 +7524,7 @@ msgstr ""
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -7283,273 +7570,320 @@ msgstr "git show [<flaggor>] <objekt>..."
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:137
+#: builtin/log.c:143
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:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Okänd incheckning %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "Kunde inte hitta exakt sammanslagningsbas."
+
+#: builtin/log.c:1235
+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 ""
+"Kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n"
+"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:1255
+msgid "Failed to find exact merge base"
+msgstr "Kunde inte hitta exakt sammanslagningsbas"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "basincheckningen bör vara förfader till revisionslistan"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "basincheckningen bör inte vara i revisionslistan"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "kan inte hämta patch-id"
+
+#: builtin/log.c:1377
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:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "epost"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
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:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "basincheckning"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "lägg till förhandskrävd trädinfo i patchserien"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Okänd incheckning %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
@@ -7740,173 +8074,177 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
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:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
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:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
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:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "tillåt sammanslagning av orelaterade historier"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Kunde inte skriva till \"%s\""
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "Skriver SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Avslutar SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7922,53 +8260,53 @@ msgstr ""
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, 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:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "\"%s\" är inte en incheckning"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, 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:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7976,7 +8314,7 @@ msgstr ""
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -7984,102 +8322,106 @@ 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:1233
+#: builtin/merge.c:1245
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:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
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:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
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:1332
+#: builtin/merge.c:1344
#, 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."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, 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."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "vägrar slå samman orelaterad historik"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, 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:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8190,7 +8532,7 @@ msgstr "git mv [<flaggor>] <källa>... <mål>"
msgid "Directory %s is in index and no submodule?"
msgstr "Katalogen %s är i indexet och inte en undermodul?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
@@ -8269,48 +8611,48 @@ 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:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
@@ -8458,24 +8800,16 @@ msgstr "kunde inte skriva anteckningsobjekt"
msgid "The note contents have been left in %s"
msgstr "Anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8488,7 +8822,7 @@ msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "för många parametrar"
@@ -8535,7 +8869,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
@@ -8575,15 +8909,15 @@ msgstr ""
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8591,51 +8925,51 @@ msgstr ""
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
@@ -8657,165 +8991,170 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+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:776
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
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:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
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:2614
+#: builtin/pack-objects.c:2619
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:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
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:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
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:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "Räknar objekt"
@@ -8843,15 +9182,15 @@ msgstr "Tar bort duplicerade objekt"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
@@ -8863,49 +9202,53 @@ msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "utför automatiskt stash/stash pop före och efter ombasering"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -8913,14 +9256,14 @@ msgstr ""
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:445
+#: builtin/pull.c:465
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:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -8928,7 +9271,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:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -8939,38 +9282,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:454
+#: builtin/pull.c:474 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:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 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:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 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:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<fjärr>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<gren>"
+
+#: builtin/pull.c:489 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:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
-msgstr ""
-"Om du vill ange spårningsinformation för grenen kan du göra det med:\n"
-"\n"
-" git branch --set-upstream-to=%s/<gren> %s\n"
+"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:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -8979,11 +9326,15 @@ 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:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash är endast giltig med --rebase."
+
+#: builtin/pull.c:872
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:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -8994,7 +9345,7 @@ msgstr ""
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9011,11 +9362,11 @@ msgstr ""
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
@@ -9376,6 +9727,18 @@ msgstr "hoppa över att applicera filter för gles utcheckning"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-katalog>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "tyst"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Du måste ange en katalog."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9699,176 +10062,178 @@ msgstr "* fjärr %s"
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(ingen URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, 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:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
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:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
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:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
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:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
@@ -10376,11 +10741,6 @@ msgstr "tillåt rekursiv borttagning"
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10583,84 +10943,180 @@ 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:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Ingen sådan referens: %s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Förväntade fullt referensnamn, fick %s"
+
+#: builtin/submodule--helper.c:71
+#, 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:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, 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:366
+#, 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:370
+#, 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:380
+#, 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:387
+#, 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:406
+msgid "Suppress output for initializing a submodule"
+msgstr "Dölj utdata från initiering av undermodul"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<sökväg>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, 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:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
-"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sökväg>...]"
+"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "kan inte öppna filen \"%s\""
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "kunde inte stänga filen %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"ödesdigert: underkommandot submodule--helper måste anropas med ett "
-"underkommando"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Undermodulsökvägen \"%s\" har inte initierats"
+
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:639
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr ""
-"ödesdigert: \"%s\" är inte ett giltigt underkommando till submodule--helper"
+msgid "Skipping unmerged submodule %s"
+msgstr "Hoppar över ej sammanslagen undermodul %s"
+
+#: builtin/submodule--helper.c:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Hoppar över undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "sökväg inuti arbetskatalogen"
+
+#: builtin/submodule--helper.c:771
+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:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout eller none"
+
+#: builtin/submodule--helper.c:779
+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:782
+msgid "parallel jobs"
+msgstr "parallella jobb"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "skriv inte klonförlopp"
+
+#: builtin/submodule--helper.c:788
+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:798
+msgid "bad value for update parameter"
+msgstr "felaktigt värde för parametern update"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10715,27 +11171,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <taggnamn>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "taggnamnet för långt: %.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "kunde inte bekräfta taggen \"%s\""
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10748,7 +11199,7 @@ msgstr ""
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10880,21 +11331,21 @@ msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l"
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -11145,7 +11596,7 @@ msgstr "git verify-commit [-v | --verbose] <incheckning>..."
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "visa råa gpg-statusdata"
@@ -11165,7 +11616,7 @@ msgstr "visa endast statistik"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <tagg>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "visa innehåll för tag"
@@ -11181,69 +11632,73 @@ msgstr "git worktree prune [<flaggor>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, 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:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, 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:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "misslyckades ta bort: %s"
+msgid "failed to remove '%s'"
+msgstr "misslyckades ta bort \"%s\""
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
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:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "befolka den nya arbetskatalogen"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
@@ -11263,7 +11718,7 @@ msgstr "visa trädobjekt för underkatalogen <prefix>"
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
@@ -11277,7 +11732,7 @@ msgstr ""
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
@@ -11405,7 +11860,7 @@ msgstr "var mer tyst"
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
@@ -11623,16 +12078,16 @@ msgstr ""
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11642,31 +12097,27 @@ 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"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11674,12 +12125,12 @@ msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11700,65 +12151,65 @@ msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
@@ -11902,26 +12353,21 @@ msgstr "Inget grennamn angavs"
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
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:291
+#: git-submodule.sh:229
#, 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:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11932,22 +12378,22 @@ msgstr ""
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, 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:332
+#: git-submodule.sh:270
#, 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:340
+#: git-submodule.sh:278
#, 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:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
@@ -11955,14 +12401,14 @@ msgstr ""
"För att återanvända den lokala git-katalogen istället för att på nytt klona "
"från"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -11971,81 +12417,61 @@ msgstr ""
"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"
"\"."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, 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:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "GÃ¥r in i \"$prefix$displaypath\""
+msgid "Entering '$displaypath'"
+msgstr "GÃ¥r in i \"$displaypath\""
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-"Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild "
-"från noll."
+"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:483
+#: git-submodule.sh:448
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules"
+msgid "pathspec and --all are incompatible"
+msgstr "sökvägsangivelse och --all är inkompatibla"
-#: git-submodule.sh:492
+#: git-submodule.sh:453
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\""
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr ""
-"Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\""
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath"
-"\""
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12054,138 +12480,174 @@ msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"Undermodulen \"$displaypath\" har inte initierats\n"
-"Kanske du vill köra \"update --init\"?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, 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:745
+#: git-submodule.sh:644
#, 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:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, 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:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, 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:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\""
+"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\""
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, 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:1019
+#: git-submodule.sh:912
#, 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:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Se git-${cmd}(1) för detaljer."
+
+#~ msgid "'%s': %s"
+#~ msgstr "\"%s\": %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "kan inte komma åt \"%s\": %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "kunde inte öppna \"%s\" för läsning: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
+
+#~ msgid " git branch -d %s\n"
+#~ msgstr " git branch -d %s\n"
+
+#~ msgid " git branch --set-upstream-to %s\n"
+#~ msgstr " git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "kan inte öppna %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "kunde inte bekräfta taggen \"%s\""
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "misslyckades ta bort: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "Undermodulen \"$displaypath\" har inte initierats\n"
+#~ "Kanske du vill köra \"update --init\"?"
+
#~ msgid "Forward-port local commits to the updated upstream head"
#~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
@@ -12253,9 +12715,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
#~ msgid "Could not append '%s'"
#~ msgstr "Kunde inte lägga till på \"%s\""
-#~ msgid "Could not set '%s'"
-#~ msgstr "Kunde inte sätta \"%s\""
-
#~ msgid "Missing author: %s"
#~ msgstr "Författare saknas: %s"
@@ -12384,13 +12843,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
#~ msgstr ""
#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
-#~ msgid ""
-#~ "You have not concluded your merge (MERGE_HEAD exists).\n"
-#~ "Please, commit your changes before you can merge."
-#~ msgstr ""
-#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
-#~ "Checka in dina ändringar innan du kan slå ihop."
-
#~ msgid "no branch specified"
#~ msgstr "inget grennamn angavs"
@@ -12593,13 +13045,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\""
#~ msgstr "sökvägar avdelas med null-tecken"
#~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Följande ospårade ändringar skulle INTE sparas utan måste tas bort med "
-#~ "\"stash save\":"
-
-#~ msgid ""
#~ "Aborting. Consider using either the --force or --include-untracked option."
#~ msgstr ""
#~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-"
diff --git a/po/vi.po b/po/vi.po
index edd8e29..f048244 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,12 +6,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.8.0-rc0\n"
+"Project-Id-Version: git v2.9.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-21 07:14+0700\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-05-25 07:39+0700\n"
"Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr ""
"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:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
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)."
@@ -80,7 +80,7 @@ msgstr "định_dạng"
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "tiá»n_tố"
@@ -88,9 +88,9 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549
#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989
-#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459
+#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459
#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561
#: builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -124,7 +124,8 @@ msgstr "nén nhỠhơn"
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "kho"
@@ -277,11 +278,16 @@ msgstr "Tên đối tượng chÆ°a rõ ràng: “%sâ€."
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%sâ€."
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s†đã sẵn được lấy ra tại “%sâ€"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "HEAD của cây làm việc %s chưa được cập nhật"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -292,7 +298,7 @@ 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:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%sâ€"
@@ -301,10 +307,10 @@ msgstr "không thể mở “%sâ€"
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
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"
@@ -341,21 +347,21 @@ msgstr "rev-list đã chết"
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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%sâ€"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "mục lục gói đã chết"
@@ -364,8 +370,8 @@ msgstr "mục lục gói đã chết"
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -399,21 +405,21 @@ msgstr "sai giá trị bằng số của cấu hình “%s†cho “%sâ€: %s"
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lá»—i mở rá»™ng thÆ° mục ngÆ°á»i dùng trong: “%sâ€"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1220
+#: config.c:1228
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:1281
+#: config.c:1284
msgid "unknown error occured 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"
@@ -432,24 +438,27 @@ msgstr "sai biến cấu hình “%s†trong tập tin “%s†tại dòng %d"
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
+#: config.c:2224
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "không thể đặt “%s†thành “%sâ€"
+
#: config.c:2226
#, c-format
-msgid "Could not set '%s' to '%s'"
-msgstr "Không thể đặt “%s†thành “%sâ€"
+msgid "could not unset '%s'"
+msgstr "không thể thôi đặt “%sâ€"
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-listâ€"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "gặp lỗi khi ghi vào rev-list: %s"
+msgid "failed write to rev-list"
+msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s"
+#: connected.c:96
+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"
#: date.c:95
msgid "in the future"
@@ -515,26 +524,26 @@ msgstr[0] "%lu năm trước"
msgid "failed to read orderfile '%s'"
msgstr "gặp lá»—i khi Ä‘á»c tập-tin-thứ-tá»± “%sâ€"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "Äang thá»±c hiện dò tìm đổi tên không chính xác"
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Gặp lá»—i khi phân tích dirstat cắt bá» phần trăm “%sâ€\n"
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%sâ€\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Không hiểu giá trị cho biến cấu hình “diff.submoduleâ€: “%sâ€"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -543,16 +552,16 @@ msgstr ""
"Tìm thấy các lá»—i trong biến cấu hình “diff.dirstatâ€:\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, 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:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác má»™t đặc tả Ä‘Æ°á»ng dẫn"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -561,20 +570,20 @@ msgstr ""
"Gặp lá»—i khi phân tích đối số tùy chá»n --dirstat/-X:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, 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â€"
-#: dir.c:2004
+#: dir.c:1823
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:2123
+#: dir.c:1942
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."
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "không thể chạy gpg."
@@ -588,28 +597,28 @@ msgstr "gpg gặp lỗi khi ký dữ liệu"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "không thể tạo tập tin tạm thá»i “%sâ€: %s"
+msgid "could not create temporary file '%s'"
+msgstr "không thể tạo tập tin tạm thá»i “%sâ€"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "gặp lá»—i khi ghi chữ ký đính kèm vào “%sâ€: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "gặp lá»—i khi ghi chữ ký đính kèm vào “%sâ€"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%sâ€: không thể Ä‘á»c %s"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "“%sâ€: %s"
+msgid "failed to stat '%s'"
+msgstr "gặp lá»—i khi lấy thống kê vỠ“%sâ€"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "“%sâ€: Ä‘á»c ngắn %s"
+msgid "'%s': short read"
+msgstr "“%sâ€: Ä‘á»c ngắn"
#: help.c:205
#, c-format
@@ -672,12 +681,36 @@ msgstr[0] ""
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
+#: lockfile.c:152
+#, 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 ""
+"Không thể tạo “%s.lockâ€: %s.\n"
+"\n"
+"Tiến trình git khác có lẽ đang chạy ở kho này, ví dụ\n"
+"má»™t trình soạn thảo được mở bởi “git commitâ€. Vui lòng chắc chắn\n"
+"rằng má»i tiến trình đã chấm dứt và sau đó thá»­ lại. Nếu vẫn lá»—i,\n"
+"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
+"gõ bỠtập tin một cách thủ công để tiếp tục."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Không thể tạo “%s.lockâ€: %s"
+
#: merge.c:41
msgid "failed to read the cache"
msgstr "gặp lá»—i khi Ä‘á»c bá»™ nhá»› đệm"
-#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
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"
@@ -724,7 +757,7 @@ msgstr "không thể Ä‘á»c đối tượng %s “%sâ€"
msgid "blob expected for %s '%s'"
msgstr "đối tượng blob được mong đợi cho %s “%sâ€"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lá»—i khi mở “%sâ€"
@@ -859,7 +892,7 @@ msgstr "Äã bá» qua %s (đã có sẵn lần hòa trá»™n này)"
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "mô-đun-con"
@@ -888,49 +921,49 @@ 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:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "Việc hòa trá»™n há»ng nghiêm trá»ng, không nên để xảy ra."
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "Äã cập nhật rồi!"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, 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:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "ÄÆ°á»ng dẫn chÆ°a được xá»­ lý??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "Äang trá»™n:"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, 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:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "hòa trộn không trả vỠlần chuyển giao nào"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%sâ€"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục"
@@ -962,28 +995,28 @@ msgstr "Giá trị %s sai: “%sâ€"
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%sâ€"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "…"
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-Sá»"
@@ -992,7 +1025,7 @@ msgstr "-Sá»"
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%sâ€"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
@@ -1062,7 +1095,7 @@ msgstr ""
"Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
"Có lẽ bạn đã quên thêm hoặc là “:/†hoặc là “.�"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
@@ -1088,23 +1121,23 @@ 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"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Không thể mở “%s†để ghi"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, 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:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "không thể xóa bỠtham chiếu: %s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỠtham chiếu: %s"
@@ -1243,94 +1276,94 @@ msgstr "định dạng: thiếu nguyên tử %%(end)"
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: remote.c:745
+#: remote.c:746
#, 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:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s thÆ°á»ng theo dõi %s, không phải %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào nhÆ° thế: “%sâ€"
-#: remote.c:1689
+#: remote.c:1690
#, 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:1695
+#: remote.c:1696
#, 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:1710
+#: remote.c:1711
#, 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:1725
+#: remote.c:1726
#, 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:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s†không bao gồm “%sâ€"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothingâ€)"
-#: remote.c:1771
+#: remote.c:1772
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:2073
+#: remote.c:2074
#, 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:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2080
+#: remote.c:2081
#, 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:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
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:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1339,11 +1372,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:2101
+#: remote.c:2102
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:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1356,22 +1389,22 @@ 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:2114
+#: remote.c:2115
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"
-#: revision.c:2131
+#: revision.c:2142
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:2134
+#: revision.c:2145
#, 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:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
@@ -1422,7 +1455,7 @@ msgstr ""
"vá»›i lệnh “git add <Ä‘Æ°á»ng_dẫn>†hoặc “git rm <Ä‘Æ°á»ng_dẫn>â€\n"
"và chuyển giao kết quả bằng lệnh “git commitâ€"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "Không thể ghi vào %s"
@@ -1582,12 +1615,12 @@ msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
msgid "Could not create sequencer directory %s"
msgstr "Không thể tạo thư mục xếp dãy %s"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "Lá»—i bao bá»c %s."
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
@@ -1599,63 +1632,72 @@ msgstr "không thể phân giải HEAD"
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:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "không thể mở %s: %s"
+msgid "cannot open %s"
+msgstr "không mở được “%sâ€"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "không thể Ä‘á»c %s: %s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:888
+#: sequencer.c:887
#, 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:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "Không thể định dạng “%sâ€."
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:1092
+#: sequencer.c:1091
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:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "gặp lá»—i khi Ä‘á»c %s"
+#: setup.c:468
+#, 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:476
+msgid "unknown repository extensions found:"
+msgstr "tìm thấy phần mở rộng kho chưa biết:"
+
#: sha1_file.c:1080
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 à?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tÆ°Æ¡ng đối nằm trÆ°á»›c chỉ mục gói cho %s (mục lục bị há»ng à?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@ -1685,31 +1727,40 @@ msgstr ""
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Không thể thay đổi .gitmodules chưa hòa trộn, hãy giải quyết xung đột trộn "
"trÆ°á»›c"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Không thể tìm thấy phần trong .gitmodules nÆ¡i mà Ä‘Æ°á»ng_dẫn=%s"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Không thể gỡ bỠmục .gitmodules dành cho %s"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "giá trị cho %s không hợp lệ"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1769,7 +1820,241 @@ msgstr "không thể đổi tên tập tin tạm thá»i thành %s"
msgid "Could not read ref %s"
msgstr "Không thể Ä‘á»c tham chiếu %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+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 "
+"checkout:\n"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
+"thể chuyển nhánh."
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\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 "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+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"
+"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn có "
+"thể hòa trộn."
+
+#: unpack-trees.c:71
+#, 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"
+
+#: unpack-trees.c:74
+#, 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 can %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 "
+"%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 có "
+"thể %s."
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\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 "
+"%s:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"Việc cập nhật các thư mục sau đây có thể làm mất các tập tin theo dõi trong "
+"nó:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+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 lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể chuyển nhánh."
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+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 lệnh "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+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 lệnh hòa "
+"trá»™n:\n"
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể hòa trộn."
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+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 lệnh hòa "
+"trá»™n:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+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 có thể %s."
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+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:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể chuyển nhánh."
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể hòa trộn."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%sVui lòng di chuyển hay gỡ bỠchúng trước khi bạn có thể %s."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"%s:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, 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:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+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:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập "
+"nhật checkout rải rác:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa bỠbởi cập "
+"nhật checkout rải rác:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "Bãi bá»\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "Äang lấy ra các tập tin"
@@ -1807,200 +2092,196 @@ msgstr "Ä‘oạn Ä‘Æ°á»ng dẫn “..†không hợp lệ"
msgid "could not open '%s' for reading and writing"
msgstr "không thể mở “%s†để Ä‘á»c và ghi"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s†để ghi"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s†để Ä‘á»c"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "không thể truy cập “%sâ€: %s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%sâ€"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "không thể mở %s để ghi"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "không thể ghi vào %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "không thể đóng %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n:"
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (dùng \"git reset %s <tập-tin>…\" để bá» ra khá»i bệ phóng)"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (dùng \"git rm --cached <tập-tin>…\" để bá» ra khá»i bệ phóng)"
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
"cần được giải quyết)"
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (dùng \"git checkout -- <tập-tin>…\" để loại bỠcác thay đổi trong thư mục "
"làm việc)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (chuyển giao hoặc là loại bỠcác nội dung chưa được theo dõi hay đã sửa "
"chữa trong mô-đun-con)"
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "được thêm vào bởi chúng ta:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "bị xóa Ä‘i bởi há»:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "được thêm vào bởi há»:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "bị xóa bởi chúng ta:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "tập tin mới:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "đã chép:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "đã xóa:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "đã sửa:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "đã đổi tên:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "đổi-kiểu:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "không hiểu:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "chưa hòa trộn:"
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "lần chuyển giao mới, "
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "nội dung bị sửa đổi, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2008,39 +2289,39 @@ msgstr ""
"Không Ä‘á»™ng đến Ä‘Æ°á»ng ở trên.\n"
"Má»i thứ phía dÆ°á»›i sẽ được xóa bá»."
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "Bạn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n."
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "Bạn Ä‘ang ở giữa của má»™t phiên “amâ€."
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỠqua miếng vá này)"
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
@@ -2197,43 +2478,43 @@ msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa
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:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1444
+#: wt-status.c:1466
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:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "HEAD được tách rá»i tại "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "HEAD được tách rá»i từ "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "Những tập tin bị lỠđi"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2245,32 +2526,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:1500
+#: wt-status.c:1522
#, 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:1502
+#: wt-status.c:1524
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:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, 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:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -2279,57 +2560,57 @@ 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:1522
+#: wt-status.c:1544
#, 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:1525
+#: wt-status.c:1547
#, 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:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1531
+#: wt-status.c:1553
#, 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:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "Lần chuyển giao khởi tạo trên "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "đã ra đi"
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "phía trước "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lá»—i khi bá» liên kết (unlink) “%sâ€"
@@ -2343,7 +2624,7 @@ msgstr "git add [<các-tùy-chá»n>] [--] <pathspec>…"
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "Cập nhật tập tin gặp lỗi"
@@ -2357,7 +2638,7 @@ 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:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "Không thể Ä‘á»c bảng mục lục"
@@ -2395,14 +2676,14 @@ msgstr ""
"của bạn:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "chi tiết"
@@ -2410,7 +2691,7 @@ msgstr "chi tiết"
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "chá»n “hunks†theo kiểu tÆ°Æ¡ng tác"
@@ -2482,16 +2763,16 @@ 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:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị há»ng"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
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"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "Không thể Ä‘á»c “%sâ€."
@@ -2519,16 +2800,6 @@ msgstr "Gặp lá»—i khi sao chép ghi chú (note) từ “%s†tá»›i “%sâ€"
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "không thể mở “%s†để Ä‘á»c: %s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Không thể mở “%s†để ghi: %s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2538,75 +2809,75 @@ msgstr "không thể phân tích cú pháp “%sâ€"
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:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "dấu thá»i gian không hợp lệ"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "độ lệch múi giỠkhông hợp lệ"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỠcác miếng vá."
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, 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:1189
+#: builtin/am.c:1188
#, 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:1190
+#: builtin/am.c:1189
#, 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:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "Miếng vá trống rỗng. Quá trình chia nhỠmiếng vá có lỗi?"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lỠkhông hợp lệ: %s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%sâ€"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
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:1633
+#: builtin/am.c:1632
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:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2614,38 +2885,38 @@ 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:1658
+#: builtin/am.c:1657
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:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
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"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, 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:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
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"
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -2653,37 +2924,37 @@ 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:1784
+#: builtin/am.c:1783
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:1834
+#: builtin/am.c:1833
#, 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:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "Ãp dụng: %.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
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:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2694,7 +2965,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:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2702,17 +2973,17 @@ msgstr ""
"Bạn vẫn có những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n trong bảng mục lục của mình.\n"
"Bạn đã quên sử dụng lệnh “git add†à?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%sâ€."
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "gặp lá»—i khi dá»n bảng mục lục"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -2720,153 +2991,155 @@ 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:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<các-tùy-chá»n>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các-tùy-chá»n>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "tùy chá»n lịch sá»­ -- không-toán-tá»­"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
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:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
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:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cỠ-k cho git-mailinfo"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cỠ-b cho git-mailinfo"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cỠ-m cho git-mailinfo"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
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:2267
+#: builtin/am.c:2266
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:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "cắt má»i thứ trÆ°á»›c dòng scissors"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "hành động"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "gốc"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "Ä‘Æ°á»ng-dẫn"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
#: parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "số"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
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:2304
+#: builtin/am.c:2303
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:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "bỠqua miếng vá hiện hành"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
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:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "nói dối vỠngày chuyển giao"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
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:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "lần chuyển giao ký-GPG"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2874,16 +3147,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:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "gặp lá»—i Ä‘á»c bảng mục lục"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, 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:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2892,7 +3165,7 @@ 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:2392
+#: builtin/am.c:2391
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."
@@ -2927,38 +3200,38 @@ msgstr "thi hành biểu thức chính quy trả vỠ%d cho đầu vào: %s"
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null†trên dòng %d"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, 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"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -2970,76 +3243,76 @@ 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)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá há»ng tại dòng %d"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, 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ũ"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, 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"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, 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"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, 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"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác†tại dòng %d"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể Ä‘á»c liên kết má»m %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay Ä‘á»c %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%câ€"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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)."
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, 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"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3048,324 +3321,334 @@ msgstr ""
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, 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â€"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, 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â€"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, 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)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "Ä‘á»c %s gặp lá»—i"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, 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"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Ä‘Æ°á»ng dẫn %s đã bị xóa hoặc đổi tên"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "loại bỠmiếng vá để lại nội dung tập tin"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "Ä‘Æ°á»ng dẫn không hợp lệ “%sâ€"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, 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)"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, 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"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "Äang kiểm tra miếng vá %s…"
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, 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â€"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỠ%s từ mục lục"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai há»ng cho mô-Ä‘un-con %s"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, 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"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, 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"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "Ä‘ang đóng tập tin “%sâ€"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s†chế độ %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Äã áp dụng miếng vá %s má»™t cách sạch sẽ."
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "lá»—i ná»™i bá»™"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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…"
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, 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"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "không thể mở %s: %s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhá»› #%d được áp dụng gá»n gàng."
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "đoạn dữ liệu #%d bị từ chối."
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "bá» qua Ä‘Æ°á»ng dẫn “%sâ€."
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "không thể Ä‘á»c tập tin lÆ°u bảng mục lục"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
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"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khá»›p vá»›i Ä‘Æ°á»ng dẫn đã cho"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
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"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "lỠđi phần bổ xung được tạo ra bởi miếng vá"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
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"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
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"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
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"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
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"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
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"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
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"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
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"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
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)"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
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"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
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"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "các Ä‘Æ°á»ng dẫn bị ngăn cách bởi ký tá»± NULL"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
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"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
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"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
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"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiá»u ngược"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
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"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
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"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
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"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
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"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way ở ngoài một kho chứa"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index ở ngoài một kho chứa"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached ở ngoài một kho chứa"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "không thể mở miếng vá “%sâ€"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, 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"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3431,101 +3714,101 @@ msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
msgid "Blaming lines"
msgstr "Các dòng blame"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
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:2531
+#: builtin/blame.c:2532
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:2532
+#: builtin/blame.c:2533
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:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
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:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
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:2539
+#: builtin/blame.c:2540
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:2540
+#: builtin/blame.c:2541
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:2541
+#: builtin/blame.c:2542
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:2542
+#: builtin/blame.c:2543
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:2543
+#: builtin/blame.c:2544
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:2544
+#: builtin/blame.c:2545
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:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "BỠqua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
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:2547
+#: builtin/blame.c:2548
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:2548
+#: builtin/blame.c:2549
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:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
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:2550
+#: builtin/blame.c:2551
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:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
@@ -3535,31 +3818,31 @@ msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<các-tùy-chá»n>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<các-tùy-chá»n>] [-l] [-f] <tên-nhánh> [<Ä‘iểm-đầu>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<các-tùy-chá»n>] [-r] (-d | -D) <tên-nhánh> …"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<các-tùy-chá»n>] (-m | -M) [<nhánh-cÅ©>] <nhánh-má»›i>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<các-tùy-chá»n>] [-r | -a] [--points-at]"
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3568,7 +3851,7 @@ msgstr ""
"đang xóa nhánh “%s†mà nó lại đã được hòa trộn vào\n"
" “%sâ€, nhÆ°ng vẫn chÆ°a được hòa trá»™n vào HEAD."
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3577,12 +3860,12 @@ msgstr ""
"không xóa nhánh “%s†cái mà chưa được hòa trộn vào\n"
" “%sâ€, cho dù là nó đã được hòa trá»™n vào HEAD."
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%sâ€"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3591,298 +3874,319 @@ msgstr ""
"Nhánh “%s†không được trộn một cách đầy đủ.\n"
"Nếu bạn thá»±c sá»± muốn xóa nó, thì chạy lệnh “git branch -D %sâ€."
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chá»n -a vá»›i -d"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "Không thể xóa nhánh “%s†cái mà bạn hiện nay đang ở."
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Không thể xóa nhánh “%s†đã được lấy ra tại “%sâ€"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%sâ€."
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%sâ€."
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lá»—i khi Ä‘ang xóa nhánh theo dõi máy chủ “%sâ€"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lá»—i khi xóa bá» nhánh “%sâ€"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Äã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s†đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: đã ra đi]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: đứng sau %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[đằng sau %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: phía trước %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[phía trước %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[trÆ°á»›c %d, sau %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** tham chiếu không hợp lệ ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, 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)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rá»i tại %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD được tách rá»i từ %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(không nhánh)"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Nhánh %s đang được cải tổ lại tại %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%sâ€"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Äã đổi tên nhánh khuyết danh “%s†đi"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "không thể ghi vào mẫu mô tả nhánh: %s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "không thể ghi mẫu mô tả nhánh"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "Tùy chá»n chung"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ Ä‘á», Ä‘Æ°a ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "thượng nguồn"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "thay đổi thông tin thượng nguồn"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-trackingâ€"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking†và nội bộ"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "khóa"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "tên trÆ°á»ng cần sắp xếp"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
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ệ."
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "tùy chá»n --column và --verbose xung khắc nhau"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "Không thể Ä‘Æ°a ra mô tả HEAD đã tách rá»i"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "không thể sá»­a mô tả cho nhiá»u hÆ¡n má»™t nhánh"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chÆ°a chuyển giao trên nhánh “%sâ€."
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%sâ€."
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "quá nhiá»u nhánh dành cho thao tác đổi tên"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "quá nhiá»u nhánh được đặt cho thượng nguồn má»›i"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -3890,40 +4194,40 @@ msgstr ""
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào nhÆ° thế “%sâ€"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "chÆ°a có nhánh “%sâ€"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "quá nhiá»u nhánh để bỠđặt thượng nguồn"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỠđặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s†không có thông tin thượng nguồn"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "không hợp lý khi tạo “HEAD†thủ công"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"hai tùy chá»n -a và -r áp dụng cho lệnh “git branch†không hợp lý đối vá»›i tên "
"nhánh"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3932,7 +4236,7 @@ msgstr ""
"Cá» --set-upstream đã lạc hậu và sẽ bị xóa bá». Nên dùng --track hoặc --set-"
"upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -3943,16 +4247,6 @@ msgstr ""
"Nếu bạn muốn “%s†theo dõi “%sâ€, thá»±c hiện lệnh sau:\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4051,7 +4345,7 @@ 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:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -4142,8 +4436,9 @@ msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "chuá»—i"
@@ -4193,80 +4488,80 @@ msgstr "Ä‘Æ°á»ng dẫn “%sâ€: không thể hòa trá»™n"
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:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, 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:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s†với %s"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, 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:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "tập tin ghi bảng mục lục bị há»ng"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "Ä‘Æ°á»ng dẫn “%s†không được hòa trá»™n"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
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:623
+#: builtin/checkout.c:622
#, 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:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD hiện giỠtại"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Äặt lại nhánh “%sâ€\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "Äã sẵn sàng trên “%sâ€\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, 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:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Äã chuyển đến nhánh má»›i “%sâ€\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Äã chuyển đến nhánh “%sâ€\n"
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiá»u hÆ¡n %d.\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4285,7 +4580,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4306,152 +4601,152 @@ msgstr[0] ""
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
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:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
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:969
+#: builtin/checkout.c:968
#, 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:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, 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:1077
+#: builtin/checkout.c:1076
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:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, 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:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s†không thể được dùng vá»›i “%sâ€"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, 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:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "rá»i bá» HEAD tại lần chuyển giao danh nghÄ©a"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
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:1148
+#: builtin/checkout.c:1147
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:1150
+#: builtin/checkout.c:1149
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:1151
+#: builtin/checkout.c:1150
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:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỠqua (mặc định)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
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"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
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:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
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:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "Ä‘Æ°á»ng dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4461,12 +4756,12 @@ msgstr ""
"Bạn đã có ý định checkout “%s†cái mà không thể được phân giải như là lần "
"chuyển giao?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, 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:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4617,8 +4912,8 @@ msgstr "dá»n bằng kiểu tÆ°Æ¡ng tác"
msgid "remove whole directories"
msgstr "gỡ bỠtoàn bộ thư mục"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "mẫu"
@@ -4658,103 +4953,112 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các-tùy-chá»n>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "số lượng mô-Ä‘un-con được nhân bản đồng thá»i"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
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:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "tên"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin†để theo dõi thượng nguồn"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
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:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
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:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "má»i mô-Ä‘un-con nhân bản sẽ là shallow (nông)"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
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:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4762,57 +5066,52 @@ 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:305
+#: builtin/clone.c:307
#, 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ợ."
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, 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ộ."
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s†là nông"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s†bị cấy ghép"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "gặp lá»—i khi lấy thống kê vỠ“%sâ€"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, 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:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "gặp lỗi khi lấy thông tin thống kê vỠ%s\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, 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:422
+#: builtin/clone.c:424
#, 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:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4822,126 +5121,126 @@ 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 checkout -f HEADâ€\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, 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:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "Äang kiểm tra kết nối… "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
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"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
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:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
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:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dá»n dẹp"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
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:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "Có quá nhiá»u đối số."
-#: builtin/clone.c:854
+#: builtin/clone.c:868
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:865
+#: builtin/clone.c:879
#, 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:868
+#: builtin/clone.c:882
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:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s†chưa tồn tại"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, 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:897
+#: builtin/clone.c:911
#, 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:907
+#: builtin/clone.c:921
#, 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:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, 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:925
+#: builtin/clone.c:939
#, 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:943
+#: builtin/clone.c:957
#, 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:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Äang nhân bản thành “%sâ€â€¦\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
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:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỠqua --local"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local bị lỠđi"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "Không biết làm cách nào để nhân bản (clone) %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, 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:1056
+#: builtin/clone.c:1070
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."
@@ -5092,68 +5391,68 @@ msgstr ""
"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
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:346
+#: builtin/commit.c:348
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:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
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:367
+#: builtin/commit.c:369
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:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
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:445
+#: builtin/commit.c:447
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:447
+#: builtin/commit.c:449
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:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
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:580
+#: builtin/commit.c:582
#, 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:582
+#: builtin/commit.c:584
#, 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:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -5161,38 +5460,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:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, 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:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, 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:704
+#: builtin/commit.c:706
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:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "không Ä‘á»c được tệp nhật ký “%sâ€"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "không thể Ä‘á»c MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "không thể Ä‘á»c SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "không thể Ä‘á»c MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5207,7 +5506,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5222,7 +5521,7 @@ msgstr ""
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5233,7 +5532,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:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5245,157 +5544,157 @@ 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:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgÆ°á»i chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "Không Ä‘á»c được bảng mục lục"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, 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:1055
+#: builtin/commit.c:1066
#, 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:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, 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:1107
+#: builtin/commit.c:1118
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:1137
+#: builtin/commit.c:1148
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:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ†cả."
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
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:1151
+#: builtin/commit.c:1162
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:1154
+#: builtin/commit.c:1165
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:1164
+#: builtin/commit.c:1175
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 tùy chá»n -c/-C/-F/--fixup"
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Tùy chá»n -m không thể được tổ hợp cùng vá»›i -c/-C/-F/--fixup."
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
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:1191
+#: builtin/commit.c:1202
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:1193
+#: builtin/commit.c:1204
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:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "Giá»i… “tu bổ†cái cuối vá»›i bảng mục lục bẩn."
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
"Những Ä‘Æ°á»ng dẫn rõ ràng được chỉ ra không có tùy chá»n -i cÅ©ng không -o; coi "
"là --only những Ä‘Æ°á»ng dẫn"
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế Ä‘á»™ dá»n dẹp không hợp lệ %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "Các Ä‘Æ°á»ng dẫn vá»›i tùy chá»n -a không hợp lý."
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-Ä‘á»c"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
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:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
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:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "hiển thị các tập tin ẩn"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -5403,205 +5702,205 @@ 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:1344
+#: builtin/commit.c:1355
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:1430
+#: builtin/commit.c:1441
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"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
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"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "đã rá»i khá»i HEAD"
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
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:1576
+#: builtin/commit.c:1592
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:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "Các tùy chá»n ghi chú commit"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "Ä‘á»c chú thích từ tập tin"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "chú thích"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
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:1584
+#: builtin/commit.c:1600
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:1585
+#: builtin/commit.c:1601
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:1586
+#: builtin/commit.c:1602
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:1587
+#: builtin/commit.c:1603
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:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
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"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
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:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
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:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "vòng qua móc (hook) pre-commit"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "“tu bổ†(amend) lần commit trước"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
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:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai há»ng (%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "không thể Ä‘á»c MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể Ä‘á»c phần chú thích (message) của llần chuyển giao: %s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, 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:1740
+#: builtin/commit.c:1760
#, 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:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5750,7 +6049,7 @@ msgstr ""
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:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5765,7 +6064,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%sâ€"
@@ -5801,7 +6100,7 @@ msgstr "thẻ được chú giải %s không có tên nhúng"
msgid "tag '%s' is really '%s' here"
msgstr "thẻ “%s†đã thực sự ở đây “%s†rồi"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "Không phải tên đối tượng %s hợp lệ"
@@ -5894,7 +6193,7 @@ msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
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:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
@@ -5928,21 +6227,21 @@ msgstr "“%sâ€: không phải tập tin bình thÆ°á»ng hay liên kết má»m"
msgid "invalid option: %s"
msgstr "tùy chá»n không hợp lệ: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s†không hợp lệ."
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiá»u hÆ¡n hai đối tượng blob: “%sâ€"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%sâ€."
@@ -6015,19 +6314,19 @@ msgstr "git fetch --multiple [<các-tùy-chá»n>] [(<kho> | <nhóm>)…]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các-tùy-chá»n>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "lấy vỠtừ tất cả các máy chủ"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
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:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
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:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
@@ -6035,7 +6334,7 @@ msgstr "ép buộc ghi đè lên nhánh nội bộ"
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiá»u máy chủ cùng lúc"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
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ó"
@@ -6047,21 +6346,21 @@ msgstr "không lấy tất cả các thẻ (--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-Ä‘un-con được lấy đồng thá»i"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
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:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
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:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải vá»"
@@ -6069,15 +6368,15 @@ msgstr "giữ lại gói đã tải vá»"
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "tmục"
@@ -6089,15 +6388,15 @@ msgstr "soạn sẵn cái này cho kết xuất Ä‘Æ°á»ng dẫn mô-Ä‘un-con"
msgid "default mode for recursion"
msgstr "chế độ mặc định cho đệ qui"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy vá»"
@@ -6155,11 +6454,6 @@ msgstr "cưỡng bức cập nhật"
msgid "(non-fast-forward)"
msgstr "(không-chuyển-tiếp-nhanh)"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "không thể mở %s: %s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6362,55 +6656,55 @@ msgstr "Äang kiểm tra kết nối"
msgid "Checking object directories"
msgstr "Äang kiểm tra các thÆ° mục đối tượng"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các-tùy-chá»n>] [<đối-tượng>…]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể Ä‘á»c được"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodesâ€"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes†(mặc định)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
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:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
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:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "Äang kiểm tra các đối tượng"
@@ -6515,217 +6809,217 @@ msgstr "không thể Ä‘á»c cây (%s)"
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:558
+#: builtin/grep.c:560
#, 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:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%sâ€"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
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:646
+#: builtin/grep.c:648
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:648
+#: builtin/grep.c:650
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:650
+#: builtin/grep.c:652
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:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "phân biệt HOA/thÆ°á»ng"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "chỉ khá»›p mẫu tại Ä‘Æ°á»ng ranh giá»›i từ"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
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:661
+#: builtin/grep.c:663
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:664
+#: builtin/grep.c:666
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:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
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:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
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:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
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:688
+#: builtin/grep.c:690
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:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
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:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
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:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
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:702
+#: builtin/grep.c:704
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:705
+#: builtin/grep.c:707
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:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C Sá»"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
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:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "Ä‘á»c mẫu từ tập-tin"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
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:737
+#: builtin/grep.c:739
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:739
+#: builtin/grep.c:741
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:741
+#: builtin/grep.c:743
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:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
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:748
+#: builtin/grep.c:750
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:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
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:899
+#: builtin/grep.c:901
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:904
+#: builtin/grep.c:906
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 các tùy chá»n liên "
"quan đến revs."
-#: builtin/grep.c:907
+#: builtin/grep.c:909
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:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
@@ -6814,8 +7108,8 @@ msgstr "phiên bản của emacsclient “%d†quá cũ (< 22)."
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "gặp lá»—i khi thá»±c thi “%sâ€: %s"
+msgid "failed to exec '%s'"
+msgstr "gặp lá»—i khi thá»±c thi “%sâ€"
#: builtin/help.c:205
#, c-format
@@ -7071,104 +7365,105 @@ msgstr "lộn xộn hơn cả điên rồ"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "đầy đủ với %d đối tượng nội bộ"
+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:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Tổng kiểm tra tail không nhÆ° mong đợi cho %s (Ä‘Ä©a há»ng?)"
+msgstr "Gặp tổng kiểm tra tail không cần cho %s (Ä‘Ä©a há»ng?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, 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:1291
+#: builtin/index-pack.c:1293
#, 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:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng ná»™i bá»™ %s bị há»ng"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%sâ€"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi “%sâ€"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỠqua %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, 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:1540
+#: builtin/index-pack.c:1542
#, 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:1587
+#: builtin/index-pack.c:1589
#, 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:1594
+#: builtin/index-pack.c:1596
#, 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:1624
+#: builtin/index-pack.c:1609
+#, 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:1638
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
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:1713 builtin/index-pack.c:1722
-#, 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:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "dùng tùy chá»n --verify mà không Ä‘Æ°a ra tên packfile"
@@ -7207,27 +7502,27 @@ msgstr "không thể sao chép “%s†sang “%sâ€"
msgid "ignoring template %s"
msgstr "Ä‘ang lá» Ä‘i mẫu “%sâ€"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "các mẫu không được tìm thấy %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ “%sâ€"
+msgid "not copying templates from '%s': %s"
+msgstr "không sao chép các mẫu từ “%sâ€: %s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s đã có từ trước rồi"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "không thể xử lý (handle) tập tin kiểu %d"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "không di chuyển được %s vào %s"
@@ -7235,24 +7530,24 @@ msgstr "không di chuyển được %s vào %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s kho Git trong %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "Khởi tạo lại đã sẵn có rồi"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "Khởi tạo trống rỗng"
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr " đã chia sẻ"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7260,25 +7555,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
"quyá»n>]] [thÆ°-mục]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "các quyá»n"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiá»u ngÆ°á»i dùng"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -7287,7 +7582,7 @@ msgstr ""
"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
"dir=<thư-mục>)"
-#: builtin/init-db.c:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "không thể truy cập cây (tree) làm việc “%sâ€"
@@ -7333,264 +7628,316 @@ msgstr "git show [<các-tùy-chá»n>] <đối-tượng>…"
msgid "invalid --decorate option: %s"
msgstr "tùy chá»n--decorate không hợp lệ: %s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "chặn má»i kết xuất từ diff"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "các tùy chá»n trang trí"
-#: builtin/log.c:137
+#: builtin/log.c:143
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:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "Không thể Ä‘á»c đối tượng %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:801
+#: builtin/log.c:812
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:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "“Cover letter†cần cho định dạng thư"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
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:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Không hiểu lần chuyển giao %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, 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:1231
+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:1235
+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 ""
+"Gặp lá»—i khi lấy thượng nguồn, nếu bạn muốn ghi lại lần chuyển giao ná»n má»™t\n"
+"cách tự động, vui lòng dùng \"git branch --set-upstream-to\" để theo dõi\n"
+"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:1255
+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:1266
+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:1270
+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:1319
+msgid "cannot get patch id"
+msgstr "không thể lấy mã miếng vá"
+
+#: builtin/log.c:1377
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:1217
+#: builtin/log.c:1380
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:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
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:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "sá»­ dụng <sfx> thay cho “.patchâ€"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
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:1231
+#: builtin/log.c:1394
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:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiá»n-tố>] thay cho [VÃ]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÃ]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
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:1244
+#: builtin/log.c:1407
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:1246
+#: builtin/log.c:1409
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:1248
+#: builtin/log.c:1411
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:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "Lá»i nhắn"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "đầu đỠthư"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "thêm đầu đỠthư"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "thêm To: đầu đỠthư"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "thêm Cc: đầu đỠthư"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "thụt lá»"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
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:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "dùng thÆ° đầu tiên để trả lá»i <message-id>"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "ranh giá»›i"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lá»i nhắn, kiểu: “shallowâ€, “deepâ€"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "lần_chuyển_giao_ná»n"
+
+#: builtin/log.c:1438
+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:1440
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
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:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix và -k xung khắc nhau."
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
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:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thÆ° mục “%sâ€"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể Ä‘á»c tập tin chữ ký “%sâ€"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
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:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7598,11 +7945,6 @@ msgstr ""
"Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một "
"cách thủ công.\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Không hiểu lần chuyển giao %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<các-tùy-chá»n>] [<tập-tin>…]"
@@ -7796,174 +8138,178 @@ msgstr "git merge [<các-tùy-chá»n>] <tin-nhắn> HEAD <commit>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "switch “m†yêu cầu một giá trị"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, 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:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, 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:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
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:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
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:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
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:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
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:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
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:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
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:213
+#: builtin/merge.c:214
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:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "tùy_chá»n=giá_trị"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
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:219
+#: builtin/merge.c:220
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:223
+#: builtin/merge.c:224
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:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "cho phép hòa trộn lịch sử không liên quan"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, 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:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "Không thể ghi vào “%sâ€"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "Äang ghi SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "Hoàn thành SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, 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:448
+#: builtin/merge.c:451
#, 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:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "Không cầm nắm gì ngoài hai head hòa trộn"
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Không hiểu tùy chá»n cho merge-recursive: -X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể Ä‘á»c từ “%sâ€"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit†để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -7981,55 +8327,55 @@ msgstr ""
"rá»—ng\n"
"sẽ hủy bỠlần chuyển giao.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vá»i.\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, 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:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "%s không phải là một lần commit (chuyển giao)"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "không phải nhánh hiện hành"
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:940
+#: builtin/merge.c:951
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:945
+#: builtin/merge.c:956
#, 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:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%sâ€"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
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:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8037,7 +8383,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:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8045,103 +8391,107 @@ 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:1233
+#: builtin/merge.c:1245
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:1242
+#: builtin/merge.c:1254
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:1250
+#: builtin/merge.c:1262
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:1267
+#: builtin/merge.c:1279
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:1269
+#: builtin/merge.c:1281
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:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
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:1332
+#: builtin/merge.c:1344
#, 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."
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, 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."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, 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"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+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:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "Äang cập nhật %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, 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:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
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:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, 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:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Äang thá»­ chiến lược hòa trá»™n %s…\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, 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:1595
+#: builtin/merge.c:1610
#, 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:1604
+#: builtin/merge.c:1619
#, 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:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -8253,7 +8603,7 @@ msgstr "git mv [<các-tùy-chá»n>] <nguồn>… <đích>"
msgid "Directory %s is in index and no submodule?"
msgstr "Thư mục “%s†có ở trong chỉ mục mà không có mô-đun con?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
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ý"
@@ -8332,49 +8682,49 @@ 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:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lá»—i khi đổi tên “%sâ€"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<các-tùy-chá»n>] <commit>…"
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<các-tùy-chá»n>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<các-tùy-chá»n>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
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:308
+#: builtin/name-rev.c:315
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:310
+#: builtin/name-rev.c:317
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:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "Ä‘á»c từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
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:318
+#: builtin/name-rev.c:325
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ộ)"
@@ -8521,24 +8871,16 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
msgid "The note contents have been left in %s"
msgstr "Nội dung ghi chú còn lại %s"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "không thể Ä‘á»c “%sâ€"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay Ä‘á»c “%sâ€"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, 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/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8551,7 +8893,7 @@ msgstr "không thể Ä‘á»c dữ liệu ghi chú từ đối tượng không-blo
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "quá nhiá»u đối số"
@@ -8598,7 +8940,7 @@ msgstr ""
msgid "Overwriting existing notes for object %s\n"
msgstr "Äang ghi đè lên ghi chú cÅ© cho đối tượng %s\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "Äang gỡ bá» ghi chú (note) cho đối tượng %s\n"
@@ -8638,15 +8980,15 @@ msgstr ""
"Các tùy chá»n -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “editâ€.\n"
"Xin hãy sá»­ dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-Câ€.\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "Tùy chá»n chung"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "Tùy chá»n vá» hòa trá»™n"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -8654,51 +8996,51 @@ msgstr ""
"phân giải các xung đột “notes†sử dụng chiến lược đã đưa ra (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
"giao"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "Hủy bỠphân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "bỠqua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "Các ghi chú hòa trộn vào %s đã sẵn trong quá trình xử lý tại %s"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "Äối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "cố gắng gỡ bỠmột note chưa từng tồn tại không phải là một lỗi"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
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:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "dùng “notes†từ <notes-ref>"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
@@ -8722,166 +9064,170 @@ msgstr ""
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+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:776
msgid "Writing objects"
msgstr "Äang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
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:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "Äang nén các đối tượng"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, 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:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%sâ€"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
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:2599
+#: builtin/pack-objects.c:2604
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:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
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:2604
+#: builtin/pack-objects.c:2609
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:2606
+#: builtin/pack-objects.c:2611
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:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "bỠqua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
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:2612
+#: builtin/pack-objects.c:2617
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:2614
+#: builtin/pack-objects.c:2619
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:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
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:2624
+#: builtin/pack-objects.c:2629
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:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr " Ä‘á»c tham số “revision†từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
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:2631
+#: builtin/pack-objects.c:2636
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:2634
+#: builtin/pack-objects.c:2639
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:2637
+#: builtin/pack-objects.c:2642
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:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
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:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể Ä‘á»c được"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "thá»i-gian"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
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:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
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:2653
+#: builtin/pack-objects.c:2658
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:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
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:2659
+#: builtin/pack-objects.c:2664
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:2661
+#: builtin/pack-objects.c:2666
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:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "Äang đếm các đối tượng"
@@ -8909,15 +9255,15 @@ msgstr "Äang gỡ các đối tượng trùng lặp"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <thá»i-gian>] [--] [<head>…]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "không gỡ bá», chỉ hiển thị"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "các đối tượng hết hạn cÅ© hÆ¡n khoảng <thá»i gian>"
@@ -8929,50 +9275,54 @@ msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các-tùy-chá»n>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "Các tùy chá»n liên quan đến hòa trá»™n"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
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:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
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/pull.c:164
+#: builtin/pull.c:156
+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:172
msgid "Options related to fetching"
msgstr "Các tùy chá»n liên quan đến lệnh lấy vá»"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-Ä‘un-con được đẩy lên đồng thá»i"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
"Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: builtin/pull.c:365
+#: builtin/pull.c:385
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."
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -8980,14 +9330,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:445
+#: builtin/pull.c:465
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:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -8996,7 +9346,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:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -9008,40 +9358,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:454
+#: builtin/pull.c:474 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:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 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:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 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:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<máy chủ>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<nhánh>"
+
+#: builtin/pull.c:489 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:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
+"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:\n"
-"\n"
-" git branch --set-upstream-to=%s/<nhánh> %s\n"
-"\n"
+"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:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9050,13 +9403,17 @@ 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:841
+#: builtin/pull.c:864
+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:872
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:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9067,7 +9424,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:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9085,11 +9442,11 @@ msgstr ""
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:890
+#: builtin/pull.c:920
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:894
+#: builtin/pull.c:924
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."
@@ -9459,6 +9816,18 @@ msgstr "bá» qua áp dụng bá»™ lá»c lấy ra (checkout) thÆ°a thá»›t"
msgid "debug unpack-trees"
msgstr "gỡ lá»—i “unpack-treesâ€"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <thư-mục-git>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "im lặng"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "Bạn phải chỉ định thư mục."
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9780,173 +10149,175 @@ msgstr "* máy chủ %s"
msgid " Fetch URL: %s"
msgstr " URL để lấy vá»: %s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(không có URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, 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:1179
+#: builtin/remote.c:1181
#, 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:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
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:1199
+#: builtin/remote.c:1201
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:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
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:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
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:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỠ%s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, 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:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Äang xén bá»›t %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy vá»"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%sâ€"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "trả vá» má»i URL"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, 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:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "đẩy các “URL†bằng tay"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
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:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
@@ -10450,12 +10821,6 @@ msgstr "cho phép gỡ bỠđệ qui"
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:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr ""
-"Vui lòng đư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:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10662,84 +11027,184 @@ 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:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "Không có tham chiếu nào như thế: %s"
+
+#: builtin/submodule--helper.c:31
+#, 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:71
+#, 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:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
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:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper list [--prefix=<Ä‘Æ°á»ng/dẫn>] [<Ä‘Æ°á»ng/dẫn>…]"
+msgstr "git submodule--helper list [--prefix=</Ä‘Æ°á»ng/dẫn>] [</Ä‘Æ°á»ng/dẫn>…]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, 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:366
+#, 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:370
+#, 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:380
+#, 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:387
+#, 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:406
+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:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [</Ä‘Æ°á»ng/dẫn>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <Ä‘Æ°á»ng/dẫn>"
+msgstr "git submodule--helper name </Ä‘Æ°á»ng/dẫn>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, 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:164
+#: builtin/submodule--helper.c:489
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:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
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:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "chiá»u sâu lịch sá»­ khi tạo bản sao"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-"git submodule--helper clone [--prefix=<Ä‘Æ°á»ng/dẫn>] [--quiet] [--reference "
-"<kho>] [--name <tên>] [--url <url>][--depth <Ä‘Æ°á»ng/dẫn>] [--] [<Ä‘Æ°á»ng/dẫn>…]"
+"git submodule--helper clone [--prefix=</Ä‘Æ°á»ng/dẫn>] [--quiet] [--reference "
+"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</Ä‘Æ°á»ng/dẫn>…]"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thÆ° mục “%sâ€"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Nhân bản “%s†vào Ä‘Æ°á»ng dẫn mô-Ä‘un-con “%s†gặp lá»—i"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "không thể mở tập tin “%sâ€"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "không thể đóng tập tin %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, 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:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
+#: builtin/submodule--helper.c:609
+#, 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:613
+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:639
+#, 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:660
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Bá» qua mô-Ä‘un-con “%sâ€"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "Ä‘Æ°á»ng dẫn đến cây làm việc"
+
+#: builtin/submodule--helper.c:771
+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:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout hoặc không làm gì cả"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-"lá»—i nghiêm trá»ng: lệnh con submodule--helper phải được gói vá»›i má»™t lệnh con"
+"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:782
+msgid "parallel jobs"
+msgstr "công việc đồng thá»i"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "đừng in tiến trình nhân bản"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+"git submodule--helper update_clone [--prefix=</Ä‘Æ°á»ng/dẫn>] [</Ä‘Æ°á»ng/dẫn>…]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "giá trị cho tham số cập nhật bị sai"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "lệnh con submodule--helper phải được gá»i vá»›i má»™t lệnh con"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:862
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "lá»—i nghiêm trá»ng: “%s†không phải là lệnh con submodule--helper hợp lệ"
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "“%s†không phải là lệnh con submodule--helper hợp lệ"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10794,27 +11259,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <tên-thẻ>…"
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "tên thẻ quá dài: %.*s…"
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%sâ€."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s†(từng là %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "không thể thẩm tra thẻ “%sâ€"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10827,7 +11287,7 @@ msgstr ""
" %s\n"
"Những dòng được bắt đầu bằng “%c†sẽ được bỠqua.\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10959,21 +11419,21 @@ msgstr "tùy chá»n --merged và --no-merged chỉ cho phép dùng vá»›i -l."
msgid "only one -F or -m option is allowed."
msgstr "chỉ có má»™t tùy chá»n -F hoặc -m là được phép."
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "quá nhiá»u đối số"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s†không phải thẻ hợp lệ."
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "Thẻ “%s†đã tồn tại rồi"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Äã cập nhật thẻ “%s†(trÆ°á»›c là %s)\n"
@@ -11227,7 +11687,7 @@ msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…"
msgid "print commit contents"
msgstr "hiển thị nội dung của lần chuyển giao"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "in kết xuất trạng thái gpg dạng thô"
@@ -11247,7 +11707,7 @@ msgstr "chỉ hiển thị thống kê"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <thẻ>…"
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
@@ -11263,68 +11723,72 @@ msgstr "git worktree prune [<các-tùy-chá»n>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<các-tùy-chá»n>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, 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:45
+#: builtin/worktree.c:46
#, 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:50
+#: builtin/worktree.c:51
#, 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:61
+#: builtin/worktree.c:62
#, 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:77
+#: builtin/worktree.c:78
#, 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:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "gặp lá»—i khi gỡ bá»: %s"
+msgid "failed to remove '%s'"
+msgstr "gặp lá»—i khi gỡ bỠ“%sâ€"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "“%s†đã có từ trước rồi"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thÆ° mục của “%sâ€"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Äang chuẩn bị %s (định danh %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
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:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "rá»i bá» HEAD tại lần chuyển giao theo tên"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "di chuyển cây làm việc mới"
+
+#: builtin/worktree.c:336
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"
@@ -11344,7 +11808,7 @@ 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"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
@@ -11358,7 +11822,7 @@ msgstr ""
"hÆ°á»›ng dẫn vá» khái niệm. Xem “git help <lệnh>†hay “git help <khái-niệm>â€\n"
"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
@@ -11488,7 +11952,7 @@ msgstr "im lặng hơn nữa"
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
@@ -11704,16 +12168,16 @@ msgstr ""
"Äể phục hồi lại thành nhánh nguyên thủy và dừng việc vá lại thì chạy \"git "
"rebase --abort\"."
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "Äã áp dụng autostash."
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Không thể lưu $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11724,35 +12188,31 @@ msgstr ""
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: git-rebase.sh:213
+#: git-rebase.sh:216
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ể chạy lệnh "
"rebase."
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "Tùy chá»n --exec phải được sá»­ dụng cùng vá»›i tùy chá»n --interactive"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
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."
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "Không thể Ä‘á»c HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11760,12 +12220,12 @@ 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"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Không thể quay trở lại $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11786,64 +12246,64 @@ 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."
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "thượng nguồn không hợp lệ $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ở đây có nhiá»u hÆ¡n má»™t ná»n móng hòa trá»™n"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ở đây không có ná»n móng hòa trá»™n nào"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ: $onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "nghiêm trá»ng: không có nhánh nhÆ° thế: $branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Äã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi."
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Nhánh hiện tại $branch_name đã được cập nhật rồi, lệnh rebase ép buộc."
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
@@ -11989,29 +12449,24 @@ msgstr "Chưa chỉ ra tên của nhánh"
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:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "không thể tháo bá» má»™t thành phần ra khá»i “$remoteurl†url"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
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:291
+#: git-submodule.sh:229
#, 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:308
+#: git-submodule.sh:246
#, 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:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -12023,36 +12478,36 @@ msgstr ""
"$sm_path\n"
"Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, 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:332
+#: git-submodule.sh:270
#, 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:340
+#: git-submodule.sh:278
#, 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:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr ""
"dùng tùy chá»n “--forceâ€. Nếu thÆ° mục git ná»™i bá»™ không phải là repo (kho) đúng"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
@@ -12061,71 +12516,53 @@ msgstr ""
"hay bạn không chắc chắn Ä‘iá»u đó có nghÄ©a gì chá»n tên khác vá»›i tùy chá»n “--"
"nameâ€."
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, 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:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, 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:373
+#: git-submodule.sh:311
#, 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:417
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "Äang vào “$prefix$displaypathâ€"
-
-#: git-submodule.sh:437
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr ""
-"Dừng lại tại “$prefix$displaypathâ€; script trả vá» trạng thái khác không."
-
-#: git-submodule.sh:483
+#: git-submodule.sh:355
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr ""
-"Không tìm thấy url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypath†trong .gitmodules"
+msgid "Entering '$displaypath'"
+msgstr "Äang vào “$displaypathâ€"
-#: git-submodule.sh:492
+#: git-submodule.sh:375
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "Gặp lá»—i khi đăng ký url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "Dừng lại tại “$displaypathâ€; script trả vá» trạng thái khác không."
-#: git-submodule.sh:494
+#: git-submodule.sh:448
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "Mô-Ä‘un-con “$name†($url) được đăng ký cho Ä‘Æ°á»ng dẫn “$displaypathâ€"
-
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr ""
-"Gặp lá»—i khi đăng ký chế Ä‘á»™ cập nhật cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
+msgid "pathspec and --all are incompatible"
+msgstr "đặc tả Ä‘Æ°á»ng dẫn và --all xung khắc nhau"
-#: git-submodule.sh:549
+#: git-submodule.sh:453
#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "Dùng “.†nếu bạn thá»±c sá»± muốn gỡ bá» má»i mô-Ä‘un-con"
+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"
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "Cây làm việc mô-đun-con “$displaypath†có chứa thư mục .git"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
@@ -12133,7 +12570,7 @@ msgstr ""
"(dùng “rm -rf†nếu bạn thực sự muốn gỡ bỠnó cùng với tất cả lịch sử của "
"chúng)"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -12142,141 +12579,178 @@ msgstr ""
"Cây làm việc mô-đun-con “$displaypath†chứa các thay đổi nội bộ; hãy dùng “-"
"f†để loại bỠchúng đi"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Äã tạo thÆ° mục “$displaypathâ€"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Không thể gỡ bá» cây làm việc mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Không thể tạo thÆ° mục mô-Ä‘un-con rá»—ng “$displaypathâ€"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-Ä‘un-con “$name†($url) được bỠđăng ký cho Ä‘Æ°á»ng dẫn “$displaypathâ€"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypath†chÆ°a được khởi tạo.\n"
-"Có lẽ bạn muốn sử dụng lệnh “update --init�"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, 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:745
+#: git-submodule.sh:644
#, 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:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy vá» trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, 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:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: đã checkout “$sha1â€"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, 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:794
+#: git-submodule.sh:686
#, 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:799
+#: git-submodule.sh:691
#, 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:800
+#: git-submodule.sh:692
#, 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:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+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 "
-"“$prefix$sm_pathâ€"
+"“$displaypathâ€"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$prefix$sm_pathâ€: “$command $sha1â€"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypathâ€: “$command $sha1â€"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, 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:944
+#: git-submodule.sh:837
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:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chỠ$mod_dst"
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, 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:1019
+#: git-submodule.sh:912
#, 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:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "blob"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Gặp lá»—i khi đệ quy vào trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con “$sm_pathâ€"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
+
+#~ msgid "'%s': %s"
+#~ msgstr "“%sâ€: %s"
+
+#~ msgid "unable to access '%s': %s"
+#~ msgstr "không thể truy cập “%sâ€: %s"
+
+#~ msgid "could not open '%s' for reading: %s"
+#~ msgstr "không thể mở “%s†để Ä‘á»c: %s"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "Không thể mở “%s†để ghi: %s"
+
+#~ msgid " git branch -d %s\n"
+#~ msgstr " git branch -d %s\n"
+
+#~ msgid " git branch --set-upstream-to %s\n"
+#~ msgstr " git branch --set-upstream-to %s\n"
+
+#~ msgid "cannot open %s: %s\n"
+#~ msgstr "không thể mở %s: %s\n"
+
+#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#~ msgstr ""
+#~ "Vui lòng đưa các thay đổi của bạn vào “.gitmodules†hay tạm cất chúng đi "
+#~ "để xử lý"
+
+#~ msgid "could not verify the tag '%s'"
+#~ msgstr "không thể thẩm tra thẻ “%sâ€"
+
+#~ msgid "failed to remove: %s"
+#~ msgstr "gặp lá»—i khi gỡ bá»: %s"
+
+#~ msgid "The --exec option must be used with the --interactive option"
+#~ msgstr "Tùy chá»n --exec phải được sá»­ dụng cùng vá»›i tùy chá»n --interactive"
+
+#~ msgid ""
+#~ "Submodule path '$displaypath' not initialized\n"
+#~ "Maybe you want to use 'update --init'?"
+#~ msgstr ""
+#~ "ÄÆ°á»ng dẫn mô-Ä‘un-con “$displaypath†chÆ°a được khởi tạo.\n"
+#~ "Có lẽ bạn muốn sử dụng lệnh “update --init�"
+
#~ msgid "Forward-port local commits to the updated upstream head"
#~ msgstr ""
#~ "Chuyển tiếp những lần chuyển giao nội bộ tới head thượng nguồn đã cập nhật"
@@ -12339,9 +12813,6 @@ msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
#~ msgid "Could not append '%s'"
#~ msgstr "Không thể nối thêm “%sâ€"
-#~ msgid "Could not set '%s'"
-#~ msgstr "Không thể đặt “%sâ€"
-
#~ msgid "unable to look up current user in the passwd file: %s"
#~ msgstr "không tìm thấy ngÆ°á»i dùng hiện tại trong tập tin passwd: %s"
@@ -12689,13 +13160,6 @@ msgstr "Url Mô-Ä‘un-con đồng bá»™ hóa cho “$displaypathâ€"
#~ msgstr "các Ä‘Æ°á»ng dẫn được ngăn cách bởi ký tá»± null"
#~ msgid ""
-#~ "The following untracked files would NOT be saved but need to be removed "
-#~ "by stash save:"
-#~ msgstr ""
-#~ "Các tập tin chưa được theo dõi sau đây KHÔNG được ghi lại nhưng cần được "
-#~ "gỡ bỠbởi việc ghi lại stash:"
-
-#~ msgid ""
#~ "Aborting. Consider using either the --force or --include-untracked option."
#~ msgstr ""
#~ "Bãi bá». Cân nhắc dùng má»™t trong hai tùy chá»n --force và --include-"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a6b06f9..36db9fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-16 00:16+0800\n"
-"PO-Revision-Date: 2016-03-16 00:18+0800\n"
+"POT-Creation-Date: 2016-05-24 23:42+0800\n"
+"PO-Revision-Date: 2016-06-06 23:05+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -158,7 +158,7 @@ msgstr ""
"请在工作区改正文件,然åŽé…Œæƒ…使用 'git add/rm <文件>' 命令标记\n"
"解决方案并æ交。"
-#: advice.c:101 builtin/merge.c:1226
+#: advice.c:101 builtin/merge.c:1238
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。"
@@ -201,7 +201,7 @@ msgstr "æ ¼å¼"
msgid "archive format"
msgstr "归档格å¼"
-#: archive.c:430 builtin/log.c:1232
+#: archive.c:430 builtin/log.c:1395
msgid "prefix"
msgstr "å‰ç¼€"
@@ -209,9 +209,9 @@ msgstr "å‰ç¼€"
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中æ¯ä¸ªè·¯å¾„å加上å‰ç¼€"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
-#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
+#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548
+#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
@@ -245,7 +245,8 @@ msgstr "压缩效果更好"
msgid "list supported archive formats"
msgstr "列出支æŒçš„归档格å¼"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
+#: builtin/submodule--helper.c:776
msgid "repo"
msgstr "仓库"
@@ -392,11 +393,16 @@ msgstr "歧义的对象å:'%s'。"
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
-#: branch.c:344
+#: branch.c:345
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'"
+#: branch.c:364
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "工作区 %s çš„ HEAD 指å‘没有被更新"
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
@@ -407,7 +413,7 @@ msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
-#: bundle.c:87 builtin/commit.c:766
+#: bundle.c:87 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
@@ -416,10 +422,10 @@ msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的æ交:"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
-#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
-#: builtin/shortlog.c:170
+#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073
+#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340
+#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875
+#: builtin/merge.c:361 builtin/shortlog.c:170
msgid "revision walk setup failed"
msgstr "版本é历设置失败"
@@ -458,21 +464,21 @@ msgstr "rev-list 终止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
+#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的å‚数:%s"
-#: bundle.c:449
+#: bundle.c:451
msgid "Refusing to create empty bundle."
msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。"
-#: bundle.c:459
+#: bundle.c:463
#, c-format
msgid "cannot create '%s'"
msgstr "ä¸èƒ½åˆ›å»º '%s'"
-#: bundle.c:480
+#: bundle.c:491
msgid "index-pack died"
msgstr "index-pack 终止"
@@ -481,8 +487,8 @@ msgstr "index-pack 终止"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
-#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
-#: builtin/am.c:2135
+#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504
+#: builtin/am.c:2134
#, c-format
msgid "could not parse %s"
msgstr "ä¸èƒ½è§£æž %s"
@@ -516,21 +522,21 @@ msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å­—å–值 '%1$s' 设置错误: %3$s"
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:758 config.c:769
+#: config.c:761 config.c:772
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:891
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模å¼ï¼š%s"
-#: config.c:1220
+#: config.c:1228
msgid "unable to parse command-line config"
msgstr "无法解æžå‘½ä»¤è¡Œä¸­çš„é…ç½®"
-#: config.c:1281
+#: config.c:1284
msgid "unknown error occured while reading the configuration files"
msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯"
@@ -549,24 +555,27 @@ msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'"
msgid "%s has multiple values"
msgstr "%s 有多个å–值"
-#: config.c:2226
+#: config.c:2224
#, c-format
-msgid "Could not set '%s' to '%s'"
+msgid "could not set '%s' to '%s'"
msgstr "ä¸èƒ½è®¾ç½® '%s' 为 '%s'"
+#: config.c:2226
+#, c-format
+msgid "could not unset '%s'"
+msgstr "ä¸èƒ½å–消设置 '%s'"
+
#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr "ä¸èƒ½æ‰§è¡Œ 'git rev-list'"
#: connected.c:89
-#, c-format
-msgid "failed write to rev-list: %s"
-msgstr "无法写入 rev-list:%s"
+msgid "failed write to rev-list"
+msgstr "无法写入 rev-list"
-#: connected.c:97
-#, c-format
-msgid "failed to close rev-list's stdin: %s"
-msgstr "无法关闭 rev-list 的标准输入:%s"
+#: connected.c:96
+msgid "failed to close rev-list's stdin"
+msgstr "无法关闭 rev-list 的标准输入"
#: date.c:95
msgid "in the future"
@@ -641,28 +650,28 @@ msgstr[1] "%lu å¹´å‰"
msgid "failed to read orderfile '%s'"
msgstr "无法读å–排åºæ–‡ä»¶ '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:538
msgid "Performing inexact rename detection"
msgstr "正在进行éžç²¾ç¡®çš„é‡å‘½å检测"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: diff.c:115
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " æ— æ³•è§£æž dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: diff.c:120
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat å‚æ•° '%s'\n"
-#: diff.c:215
+#: diff.c:225
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值:'%s'"
-#: diff.c:267
+#: diff.c:277
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -671,16 +680,16 @@ msgstr ""
"å‘现é…ç½®å˜é‡ 'diff.dirstat' 中的错误:\n"
"%s"
-#: diff.c:2997
+#: diff.c:3007
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,åœæ­¢åœ¨ %s"
-#: diff.c:3393
+#: diff.c:3405
msgid "--follow requires exactly one pathspec"
msgstr "--follow å‚æ•°åŽåªè·Ÿä¸€ä¸ª pathspec"
-#: diff.c:3556
+#: diff.c:3568
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -689,20 +698,20 @@ msgstr ""
"æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n"
"%s"
-#: diff.c:3570
+#: diff.c:3582
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'"
-#: dir.c:2004
+#: dir.c:1823
msgid "failed to get kernel name and information"
msgstr "无法获得内核å称和信æ¯"
-#: dir.c:2123
+#: dir.c:1942
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或ä½ç½®ä¸­è¢«ç¦ç”¨ã€‚"
-#: gpg-interface.c:166 gpg-interface.c:237
+#: gpg-interface.c:166 gpg-interface.c:235
msgid "could not run gpg."
msgstr "ä¸èƒ½æ‰§è¡Œ gpg。"
@@ -716,28 +725,28 @@ msgstr "gpg 无法为数æ®ç­¾å"
#: gpg-interface.c:222
#, c-format
-msgid "could not create temporary file '%s': %s"
-msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶ '%s':%s"
+msgid "could not create temporary file '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶ '%s'"
-#: gpg-interface.c:225
+#: gpg-interface.c:224
#, c-format
-msgid "failed writing detached signature to '%s': %s"
-msgstr "无法将分离å¼ç­¾å写入 '%s':%s"
+msgid "failed writing detached signature to '%s'"
+msgstr "无法将分离å¼ç­¾å写入 '%s'"
#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'ï¼šæ— æ³•è¯»å– %s"
-#: grep.c:1735
+#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
#, c-format
-msgid "'%s': %s"
-msgstr "'%s':%s"
+msgid "failed to stat '%s'"
+msgstr "无法枚举 '%s' 状æ€"
#: grep.c:1746
#, c-format
-msgid "'%s': short read %s"
-msgstr "'%s':读å–ä¸å®Œæ•´ %s"
+msgid "'%s': short read"
+msgstr "'%s':读å–ä¸å®Œæ•´"
#: help.c:205
#, c-format
@@ -803,12 +812,35 @@ msgstr[1] ""
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
+#: lockfile.c:152
+#, 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:160
+#, 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:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
-#: builtin/checkout.c:587 builtin/clone.c:730
+#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:732
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
@@ -855,7 +887,7 @@ msgstr "ä¸èƒ½è¯»å–对象 %s '%s'"
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数æ®å¯¹è±¡"
-#: merge-recursive.c:790 builtin/clone.c:374
+#: merge-recursive.c:790 builtin/clone.c:376
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
@@ -990,7 +1022,7 @@ msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰"
msgid "Auto-merging %s"
msgstr "自动åˆå¹¶ %s"
-#: merge-recursive.c:1650 git-submodule.sh:1048
+#: merge-recursive.c:1650 git-submodule.sh:941
msgid "submodule"
msgstr "å­æ¨¡ç»„"
@@ -1017,50 +1049,50 @@ msgstr "目录/文件"
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:1783
+#: merge-recursive.c:1781
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1800
+#: merge-recursive.c:1798
msgid "Fatal merge failure, shouldn't happen."
msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。"
-#: merge-recursive.c:1819
+#: merge-recursive.c:1817
msgid "Already up-to-date!"
msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1826
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法åˆå¹¶æ ‘ %s å’Œ %s"
-#: merge-recursive.c:1858
+#: merge-recursive.c:1856
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处ç†çš„路径??? %s"
-#: merge-recursive.c:1906
+#: merge-recursive.c:1904
msgid "Merging:"
msgstr "åˆå¹¶ï¼š"
-#: merge-recursive.c:1919
+#: merge-recursive.c:1917
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "å‘现 %u 个共åŒç¥–先:"
msgstr[1] "å‘现 %u 个共åŒç¥–先:"
-#: merge-recursive.c:1956
+#: merge-recursive.c:1954
msgid "merge returned no commit"
msgstr "åˆå¹¶æœªè¿”回æ交"
-#: merge-recursive.c:2013
+#: merge-recursive.c:2011
#, c-format
msgid "Could not parse object '%s'"
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'"
-#: merge-recursive.c:2024 builtin/merge.c:646
+#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831
msgid "Unable to write index."
msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚"
@@ -1090,29 +1122,29 @@ msgstr "åçš„ %s 值:'%s'"
msgid "unable to parse object: %s"
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s"
-#: parse-options.c:570
+#: parse-options.c:572
msgid "..."
msgstr "..."
-#: parse-options.c:588
+#: parse-options.c:590
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:592
+#: parse-options.c:594
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: parse-options.c:595
+#: parse-options.c:597
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:629
+#: parse-options.c:631
msgid "-NUM"
msgstr "-æ•°å­—"
@@ -1121,7 +1153,7 @@ msgstr "-æ•°å­—"
msgid "malformed object name '%s'"
msgstr "éžæ³•çš„对象å '%s'"
-#: path.c:752
+#: path.c:796
#, c-format
msgid "Could not make %s writable by group"
msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™"
@@ -1188,7 +1220,7 @@ msgstr ""
"没有为 :(exclude) 模å¼æä¾›è¦å¿½ç•¥çš„内容。也许您忘记了\n"
"添加 ':/' 或 '.' ?"
-#: pretty.c:969
+#: pretty.c:971
msgid "unable to parse --pretty format"
msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼"
@@ -1214,23 +1246,23 @@ msgstr ""
"设置了 GIT_INDEX_VERSION,但是å–值无效。\n"
"使用版本 %i"
-#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
-#: builtin/merge.c:984
+#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985
+#: builtin/merge.c:995
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs/files-backend.c:2374
+#: refs/files-backend.c:2243
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s:%s"
-#: refs/files-backend.c:2377
+#: refs/files-backend.c:2246
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
-#: refs/files-backend.c:2386
+#: refs/files-backend.c:2255
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
@@ -1369,93 +1401,93 @@ msgstr "æ ¼å¼ï¼šç¼ºå°‘ %%(end) 元素"
msgid "malformed object name %s"
msgstr "éžæ³•çš„对象å %s"
-#: remote.c:745
+#: remote.c:746
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "ä¸èƒ½åŒæ—¶èŽ·å– %s å’Œ %s 至 %s"
-#: remote.c:749
+#: remote.c:750
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %sï¼Œè€Œéž %s"
-#: remote.c:753
+#: remote.c:754
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s"
-#: remote.c:761
+#: remote.c:762
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1678 remote.c:1721
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指å‘一个分支"
-#: remote.c:1686
+#: remote.c:1687
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1695
+#: remote.c:1696
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1710
+#: remote.c:1711
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨"
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„目标"
-#: remote.c:2073
+#: remote.c:2074
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已ç»ä¸å­˜åœ¨ã€‚\n"
-#: remote.c:2077
+#: remote.c:2078
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n"
-#: remote.c:2080
+#: remote.c:2081
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2084
+#: remote.c:2085
#, 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:2090
+#: remote.c:2091
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n"
-#: remote.c:2093
+#: remote.c:2094
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -1464,11 +1496,11 @@ msgstr[0] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
msgstr[1] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2101
+#: remote.c:2102
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n"
-#: remote.c:2104
+#: remote.c:2105
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -1484,20 +1516,20 @@ msgstr[1] ""
"并且分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: remote.c:2114
+#: remote.c:2115
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n"
-#: revision.c:2131
+#: revision.c:2142
msgid "your current branch appears to be broken"
msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå"
-#: revision.c:2134
+#: revision.c:2145
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当å‰åˆ†æ”¯ '%s' 尚无任何æ交"
-#: revision.c:2328
+#: revision.c:2339
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect ä¸å…¼å®¹"
@@ -1545,7 +1577,7 @@ msgstr ""
"冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n"
"对修正åŽçš„文件åšæ ‡è®°ï¼Œç„¶åŽç”¨ 'git commit' æ交"
-#: sequencer.c:190 sequencer.c:833 sequencer.c:913
+#: sequencer.c:190 sequencer.c:833 sequencer.c:912
#, c-format
msgid "Could not write to %s"
msgstr "ä¸èƒ½å†™å…¥ %s"
@@ -1703,12 +1735,12 @@ msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\""
msgid "Could not create sequencer directory %s"
msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s"
-#: sequencer.c:835 sequencer.c:917
+#: sequencer.c:835 sequencer.c:916
#, c-format
msgid "Error wrapping up %s."
msgstr "错误收尾 %s。"
-#: sequencer.c:854 sequencer.c:987
+#: sequencer.c:854 sequencer.c:986
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原æ“作并未进行"
@@ -1720,63 +1752,72 @@ msgstr "ä¸èƒ½è§£æž HEAD"
msgid "cannot abort from a branch yet to be born"
msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终止"
-#: sequencer.c:878 builtin/apply.c:4287
+#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851
#, c-format
-msgid "cannot open %s: %s"
-msgstr "ä¸èƒ½æ‰“å¼€ %s:%s"
+msgid "cannot open %s"
+msgstr "ä¸èƒ½æ‰“å¼€ %s"
-#: sequencer.c:881
+#: sequencer.c:880
#, c-format
msgid "cannot read %s: %s"
msgstr "ä¸èƒ½è¯»å– %s:%s"
-#: sequencer.c:882
+#: sequencer.c:881
msgid "unexpected end of file"
msgstr "æ„外的文件结æŸ"
-#: sequencer.c:888
+#: sequencer.c:887
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "ä¿å­˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå"
-#: sequencer.c:910
+#: sequencer.c:909
#, c-format
msgid "Could not format %s."
msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。"
-#: sequencer.c:1055
+#: sequencer.c:1054
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s"
-#: sequencer.c:1058
+#: sequencer.c:1057
#, c-format
msgid "%s: bad revision"
msgstr "%s:错误的版本"
-#: sequencer.c:1092
+#: sequencer.c:1091
msgid "Can't revert as initial commit"
msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原"
-#: sequencer.c:1093
+#: sequencer.c:1092
msgid "Can't cherry-pick into empty head"
msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯"
-#: setup.c:246
+#: setup.c:248
#, c-format
msgid "failed to read %s"
msgstr "æ— æ³•è¯»å– %s"
+#: setup.c:468
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 仓库版本 <= %d,å´å¾—到 %d"
+
+#: setup.c:476
+msgid "unknown repository extensions found:"
+msgstr "å‘现未知的仓库扩展:"
+
#: sha1_file.c:1080
msgid "offset before end of packfile (broken .idx?)"
msgstr "å移é‡åœ¨åŒ…文件结æŸä¹‹å‰ï¼ˆæŸåçš„ .idx?)"
-#: sha1_file.c:2459
+#: sha1_file.c:2458
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "å移é‡åœ¨ %s 的包索引开始之å‰ï¼ˆæŸå的索引?)"
-#: sha1_file.c:2463
+#: sha1_file.c:2462
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "å移é‡è¶Šè¿‡äº† %s 的包索引的结尾(被截断的索引?)"
@@ -1802,29 +1843,38 @@ msgstr ""
"å¯èƒ½éœ€è¦åˆ é™¤å®ƒä»¬ã€‚用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消æ¯é€šçŸ¥ã€‚"
-#: submodule.c:62 submodule.c:96
+#: submodule.c:64 submodule.c:98
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未åˆå¹¶çš„ .gitmodules,先解决åˆå¹¶å†²çª"
-#: submodule.c:66 submodule.c:100
+#: submodule.c:68 submodule.c:102
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s çš„å°èŠ‚"
-#: submodule.c:74
+#: submodule.c:76
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "ä¸èƒ½æ›´æ–° .gitmodules æ¡ç›® %s"
-#: submodule.c:107
+#: submodule.c:109
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s çš„ .gitmodules æ¡ç›®"
-#: submodule.c:118
+#: submodule.c:120
msgid "staging updated .gitmodules failed"
msgstr "å°†æ›´æ–°åŽ .gitmodules 添加暂存区失败"
+#: submodule.c:177
+msgid "negative values not allowed for submodule.fetchJobs"
+msgstr "submodule.fetchJobs ä¸å…许为负值"
+
+#: submodule-config.c:355
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
+
#: trailer.c:237
#, c-format
msgid "running trailer command '%s' failed"
@@ -1884,7 +1934,219 @@ msgstr "ä¸èƒ½é‡å‘½å临时文件为 %s"
msgid "Could not read ref %s"
msgstr "ä¸èƒ½è¯»å–引用 %s"
-#: unpack-trees.c:203
+#: unpack-trees.c:64
+#, 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 can switch branches."
+msgstr ""
+"您对下列文件的本地修改将被检出æ“作覆盖:\n"
+"%%s请在切æ¢åˆ†æ”¯å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
+
+#: unpack-trees.c:66
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被检出æ“作覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:69
+#, 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 can merge."
+msgstr ""
+"您对下列文件的本地修改将被åˆå¹¶æ“作覆盖:\n"
+"%%s请在åˆå¹¶å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
+
+#: unpack-trees.c:71
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被åˆå¹¶æ“作覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:74
+#, 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 can %s."
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖:\n"
+"%%s请在 %s 之å‰æ交您的修改或者ä¿å­˜è¿›åº¦ã€‚"
+
+#: unpack-trees.c:76
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您对下列文件的本地修改将被 %s 覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:81
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in it:\n"
+"%s"
+msgstr ""
+"更新如下目录将会丢失其中未跟踪的文件:\n"
+"%s"
+
+#: unpack-trees.c:85
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出æ“作而被删除:\n"
+"%%s请在切æ¢åˆ†æ”¯ä¹‹å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:87
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出æ“作而被删除:\n"
+"%%s"
+
+#: unpack-trees.c:90
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被删除:\n"
+"%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:92
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被删除:\n"
+"%%s"
+
+#: unpack-trees.c:95
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s æ“作而被删除:\n"
+"%%s请在 %s å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:97
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s æ“作而被删除:\n"
+"%%s"
+
+#: unpack-trees.c:102
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you can switch branches."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出æ“作而被覆盖:\n"
+"%%s请在切æ¢åˆ†æ”¯å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为检出æ“作而被覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:107
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you can merge."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被覆盖:\n"
+"%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为åˆå¹¶æ“作而被覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you can %s."
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s æ“作而被覆盖:\n"
+"%%s请在 %s å‰ç§»åŠ¨æˆ–删除。"
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作区中下列未跟踪的文件将会因为 %s æ“作而被覆盖:\n"
+"%%s"
+
+#: unpack-trees.c:121
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "æ¡ç›® '%s' å’Œ '%s' é‡å ã€‚无法åˆå¹¶ã€‚"
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
+msgstr ""
+"无法更新稀ç–检出:如下æ¡ç›®ä¸æ˜¯æœ€æ–°ï¼š\n"
+"%s"
+
+#: unpack-trees.c:126
+#, c-format
+msgid ""
+"The following Working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将会因为稀ç–检出而被覆盖:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"The following Working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"工作区中下列文件将会因为稀ç–检出而被删除:\n"
+"%s"
+
+#: unpack-trees.c:205
+#, c-format
+msgid "Aborting\n"
+msgstr "终止中\n"
+
+#: unpack-trees.c:237
msgid "Checking out files"
msgstr "正在检出文件"
@@ -1922,205 +2184,201 @@ msgstr "无效的 '..' 路径片段"
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:224 wrapper.c:383
+#: wrapper.c:224 wrapper.c:383 builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
-#: builtin/merge.c:1075 builtin/pull.c:387
+#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772
+#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086
+#: builtin/pull.c:407
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读å–"
-#: wrapper.c:611
-#, c-format
-msgid "unable to access '%s': %s"
-msgstr "ä¸èƒ½è®¿é—® '%s':%s"
-
-#: wrapper.c:632
+#: wrapper.c:594 wrapper.c:615
#, c-format
msgid "unable to access '%s'"
msgstr "ä¸èƒ½è®¿é—® '%s'"
-#: wrapper.c:640
+#: wrapper.c:623
msgid "unable to get current working directory"
msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•"
-#: wrapper.c:667
+#: wrapper.c:650
#, c-format
msgid "could not open %s for writing"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: wrapper.c:678 builtin/am.c:410
+#: wrapper.c:661 builtin/am.c:410
#, c-format
msgid "could not write to %s"
msgstr "ä¸èƒ½å†™å…¥ %s"
-#: wrapper.c:684
+#: wrapper.c:667
#, c-format
msgid "could not close %s"
msgstr "ä¸èƒ½å…³é—­ %s"
-#: wt-status.c:149
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "未åˆå¹¶çš„路径:"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:176 wt-status.c:203
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (使用 \"git reset %s <文件>...\" 以å–消暂存)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (使用 \"git rm --cached <文件>...\" 以å–消暂存)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:182
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:184 wt-status.c:188
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:186
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
-#: wt-status.c:197 wt-status.c:880
+#: wt-status.c:198 wt-status.c:881
msgid "Changes to be committed:"
msgstr "è¦æ交的å˜æ›´ï¼š"
-#: wt-status.c:215 wt-status.c:889
+#: wt-status.c:216 wt-status.c:890
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备æ交的å˜æ›´ï¼š"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:219
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (使用 \"git add <文件>...\" æ›´æ–°è¦æ交的内容)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (使用 \"git add/rm <文件>...\" æ›´æ–°è¦æ交的内容)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:222
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:224
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (æ交或丢弃å­æ¨¡ç»„中未跟踪或修改的内容)"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:236
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (使用 \"git %s <文件>...\" 以包å«è¦æ交的内容)"
-#: wt-status.c:251
+#: wt-status.c:252
msgid "both deleted:"
msgstr "åŒæ–¹åˆ é™¤ï¼š"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "added by us:"
msgstr "由我们添加:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "由他们删除:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "added by them:"
msgstr "由他们添加:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "由我们删除:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "both added:"
msgstr "åŒæ–¹æ·»åŠ ï¼š"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both modified:"
msgstr "åŒæ–¹ä¿®æ”¹ï¼š"
-#: wt-status.c:265
+#: wt-status.c:266
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "bug:无法处ç†çš„未åˆå¹¶çŠ¶æ€ %x"
-#: wt-status.c:273
+#: wt-status.c:274
msgid "new file:"
msgstr "新文件:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "copied:"
msgstr "æ‹·è´ï¼š"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "deleted:"
msgstr "删除:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "modified:"
msgstr "修改:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "renamed:"
msgstr "é‡å‘½å:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "typechange:"
msgstr "类型å˜æ›´ï¼š"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "unknown:"
msgstr "未知:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unmerged:"
msgstr "未åˆå¹¶ï¼š"
# 译者:末尾两个字节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为中文标点会出现åŠä¸ªæ±‰å­—
-#: wt-status.c:369
+#: wt-status.c:370
msgid "new commits, "
msgstr "æ–°æ交, "
# 译者:末尾两个字节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为中文标点会出现åŠä¸ªæ±‰å­—
-#: wt-status.c:371
+#: wt-status.c:372
msgid "modified content, "
msgstr "修改的内容, "
# 译者:末尾两个字节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为中文标点会出现åŠä¸ªæ±‰å­—
-#: wt-status.c:373
+#: wt-status.c:374
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:390
+#: wt-status.c:391
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "bug:无法处ç†çš„å·®å¼‚çŠ¶æ€ %c"
-#: wt-status.c:754
+#: wt-status.c:755
msgid "Submodules changed but not updated:"
msgstr "å­æ¨¡ç»„已修改但尚未更新:"
-#: wt-status.c:756
+#: wt-status.c:757
msgid "Submodule changes to be committed:"
msgstr "è¦æ交的å­æ¨¡ç»„å˜æ›´ï¼š"
-#: wt-status.c:837
+#: wt-status.c:838
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -2128,44 +2386,44 @@ msgstr ""
"ä¸è¦æ”¹åŠ¨ä¸Šé¢çš„一行。\n"
"下é¢çš„所有内容å‡å°†è¢«åˆ é™¤ã€‚"
-#: wt-status.c:948
+#: wt-status.c:949
msgid "You have unmerged paths."
msgstr "您有尚未åˆå¹¶çš„路径。"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:951
+#: wt-status.c:952
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")"
-#: wt-status.c:954
+#: wt-status.c:956
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸­ã€‚"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:957
+#: wt-status.c:959
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰"
-#: wt-status.c:967
+#: wt-status.c:969
msgid "You are in the middle of an am session."
msgstr "您正处于 am æ“作过程中。"
-#: wt-status.c:970
+#: wt-status.c:972
msgid "The current patch is empty."
msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:974
+#: wt-status.c:976
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\")"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:976
+#: wt-status.c:978
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补ä¸ï¼‰"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: wt-status.c:978
+#: wt-status.c:980
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰"
@@ -2319,43 +2577,43 @@ msgstr "您在执行二分查找æ“作。"
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
-#: wt-status.c:1438
+#: wt-status.c:1460
msgid "On branch "
msgstr "ä½äºŽåˆ†æ”¯ "
-#: wt-status.c:1444
+#: wt-status.c:1466
msgid "interactive rebase in progress; onto "
msgstr "交互å¼å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1446
+#: wt-status.c:1468
msgid "rebase in progress; onto "
msgstr "å˜åŸºæ“作正在进行中;至 "
-#: wt-status.c:1451
+#: wt-status.c:1473
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1453
+#: wt-status.c:1475
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1456
+#: wt-status.c:1478
msgid "Not currently on any branch."
msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚"
-#: wt-status.c:1474
+#: wt-status.c:1496
msgid "Initial commit"
msgstr "åˆå§‹æ交"
-#: wt-status.c:1488
+#: wt-status.c:1510
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1490
+#: wt-status.c:1512
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1494
+#: wt-status.c:1516
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2365,88 +2623,88 @@ msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度,\n"
"但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ æ–°æ–‡ä»¶ï¼ˆå‚è§ 'git help status')。"
-#: wt-status.c:1500
+#: wt-status.c:1522
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1502
+#: wt-status.c:1524
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u å‚数显示未跟踪的文件)"
-#: wt-status.c:1508
+#: wt-status.c:1530
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1513
+#: wt-status.c:1535
#, 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:1516
+#: wt-status.c:1538
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入æ交\n"
-#: wt-status.c:1519
+#: wt-status.c:1541
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "æ交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
-#: wt-status.c:1522
+#: wt-status.c:1544
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "æ交为空,但是存在尚未跟踪的文件\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1525
+#: wt-status.c:1547
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件è¦æ交(创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪)\n"
-#: wt-status.c:1528 wt-status.c:1533
+#: wt-status.c:1550 wt-status.c:1555
#, c-format
msgid "nothing to commit\n"
msgstr "无文件è¦æ交\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1531
+#: wt-status.c:1553
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件è¦æ交(使用 -u 显示未跟踪的文件)\n"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: wt-status.c:1535
+#: wt-status.c:1557
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "无文件è¦æ交,干净的工作区\n"
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1642
+#: wt-status.c:1664
msgid "Initial commit on "
msgstr "åˆå§‹æ交于 "
-#: wt-status.c:1646
+#: wt-status.c:1668
msgid "HEAD (no branch)"
msgstr "HEAD(éžåˆ†æ”¯ï¼‰"
-#: wt-status.c:1675
+#: wt-status.c:1697
msgid "gone"
msgstr "丢失"
# 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼
-#: wt-status.c:1677 wt-status.c:1685
+#: wt-status.c:1699 wt-status.c:1707
msgid "behind "
msgstr "è½åŽ "
-#: wt-status.c:1680 wt-status.c:1683
+#: wt-status.c:1702 wt-status.c:1705
msgid "ahead "
msgstr "领先 "
-#: compat/precompose_utf8.c:57 builtin/clone.c:413
+#: compat/precompose_utf8.c:57 builtin/clone.c:415
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -2460,7 +2718,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."
msgid "unexpected diff status %c"
msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c"
-#: builtin/add.c:70 builtin/commit.c:278
+#: builtin/add.c:70 builtin/commit.c:280
msgid "updating files failed"
msgstr "更新文件失败"
@@ -2473,7 +2731,7 @@ msgstr "删除 '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之åŽå°šæœªè¢«æš‚存的å˜æ›´ï¼š"
-#: builtin/add.c:194 builtin/rev-parse.c:797
+#: builtin/add.c:194 builtin/rev-parse.c:811
msgid "Could not read the index"
msgstr "ä¸èƒ½è¯»å–索引"
@@ -2509,14 +2767,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n"
#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
-#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511
+#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
-#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19
+#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557
+#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114
msgid "be verbose"
msgstr "冗长输出"
@@ -2524,7 +2782,7 @@ msgstr "冗长输出"
msgid "interactive picking"
msgstr "交互å¼æ‹£é€‰"
-#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互å¼æŒ‘选数æ®å—"
@@ -2592,16 +2850,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n"
#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
-#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:35
+#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/submodule--helper.c:240
msgid "index file corrupt"
msgstr "索引文件æŸå"
-#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
+#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
+#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089
#, c-format
msgid "could not read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
@@ -2629,16 +2887,6 @@ msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败"
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:772 builtin/am.c:860
-#, c-format
-msgid "could not open '%s' for reading: %s"
-msgstr "无法打开 '%s' 进行读å–:%s"
-
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "无法打开 '%s' 进行写入:%s"
-
#: builtin/am.c:788
#, c-format
msgid "could not parse patch '%s'"
@@ -2648,73 +2896,73 @@ msgstr "无法解æžè¡¥ä¸ '%s'"
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用"
-#: builtin/am.c:901
+#: builtin/am.c:900
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:904 builtin/am.c:912
+#: builtin/am.c:903 builtin/am.c:911
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:909
+#: builtin/am.c:908
msgid "invalid timezone offset"
msgstr "无效的时区å移值"
-#: builtin/am.c:996
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚"
-#: builtin/am.c:1001 builtin/clone.c:378
+#: builtin/am.c:1000 builtin/clone.c:380
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:1005
+#: builtin/am.c:1004
msgid "Failed to split patches."
msgstr "无法拆分补ä¸ã€‚"
-#: builtin/am.c:1137 builtin/commit.c:363
+#: builtin/am.c:1136 builtin/commit.c:365
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1188
+#: builtin/am.c:1187
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
-#: builtin/am.c:1189
+#: builtin/am.c:1188
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。"
-#: builtin/am.c:1190
+#: builtin/am.c:1189
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ­¢è¡¥ä¸æ“作,执行 \"%s --abort\"。"
-#: builtin/am.c:1328
+#: builtin/am.c:1327
msgid "Patch is empty. Was it split wrong?"
msgstr "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ"
-#: builtin/am.c:1402 builtin/log.c:1350
+#: builtin/am.c:1401 builtin/log.c:1516
#, c-format
msgid "invalid ident line: %s"
msgstr "包å«æ— æ•ˆçš„身份标识:%s"
-#: builtin/am.c:1429
+#: builtin/am.c:1428
#, c-format
msgid "unable to parse commit %s"
msgstr "ä¸èƒ½è§£æžæ交 %s"
-#: builtin/am.c:1631
+#: builtin/am.c:1630
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚"
-#: builtin/am.c:1633
+#: builtin/am.c:1632
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„)基础目录树..."
-#: builtin/am.c:1652
+#: builtin/am.c:1651
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -2722,37 +2970,37 @@ msgstr ""
"您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n"
"无法应用补ä¸åˆ°ç´¢å¼•ä¸­çš„æ•°æ®å¯¹è±¡ä¸Šã€‚"
-#: builtin/am.c:1658
+#: builtin/am.c:1657
msgid "Falling back to patching base and 3-way merge..."
msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..."
-#: builtin/am.c:1673
+#: builtin/am.c:1672
msgid "Failed to merge in the changes."
msgstr "无法åˆå¹¶å˜æ›´ã€‚"
-#: builtin/am.c:1697 builtin/merge.c:633
+#: builtin/am.c:1696 builtin/merge.c:636
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
msgid "applying to an empty history"
msgstr "正应用到一个空历å²ä¸Š"
-#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
-#: builtin/merge.c:855
+#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841
+#: builtin/merge.c:866
msgid "failed to write commit object"
msgstr "无法写æ交对象"
-#: builtin/am.c:1749 builtin/am.c:1753
+#: builtin/am.c:1748 builtin/am.c:1752
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s ä¸å­˜åœ¨ã€‚"
-#: builtin/am.c:1769
+#: builtin/am.c:1768
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。"
-#: builtin/am.c:1774
+#: builtin/am.c:1773
msgid "Commit Body is:"
msgstr "æ交内容为:"
@@ -2761,35 +3009,35 @@ msgstr "æ交内容为:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1784
+#: builtin/am.c:1783
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]:"
-#: builtin/am.c:1834
+#: builtin/am.c:1833
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "è„索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:%s)"
-#: builtin/am.c:1869 builtin/am.c:1941
+#: builtin/am.c:1868 builtin/am.c:1940
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
-#: builtin/am.c:1885
+#: builtin/am.c:1884
msgid "No changes -- Patch already applied."
msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。"
-#: builtin/am.c:1893
+#: builtin/am.c:1892
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s"
-#: builtin/am.c:1899
+#: builtin/am.c:1898
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s"
-#: builtin/am.c:1944
+#: builtin/am.c:1943
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -2799,7 +3047,7 @@ msgstr ""
"如果没有什么è¦æ·»åŠ åˆ°æš‚存区的,则很å¯èƒ½æ˜¯å…¶å®ƒæ交已ç»å¼•å…¥äº†ç›¸åŒçš„å˜æ›´ã€‚\n"
"您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚"
-#: builtin/am.c:1951
+#: builtin/am.c:1950
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -2807,168 +3055,170 @@ msgstr ""
"您的索引中ä»æœ‰æœªåˆå¹¶çš„路径。\n"
"您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?"
-#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
+#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。"
-#: builtin/am.c:2111
+#: builtin/am.c:2110
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2145
+#: builtin/am.c:2144
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:2206
+#: builtin/am.c:2205
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
-#: builtin/am.c:2239
+#: builtin/am.c:2238
msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2246
+#: builtin/am.c:2245
msgid "run interactively"
msgstr "以交互å¼æ–¹å¼è¿è¡Œ"
-#: builtin/am.c:2248
+#: builtin/am.c:2247
msgid "historical option -- no-op"
msgstr "è€çš„å‚æ•° —— 无作用"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "allow fall back on 3way merging if needed"
msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚"
-#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
+#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57
#: builtin/repack.c:171
msgid "be quiet"
msgstr "é™é»˜æ¨¡å¼"
-#: builtin/am.c:2253
+#: builtin/am.c:2252
msgid "add a Signed-off-by line to the commit message"
msgstr "在æ交说明中添加一个 Signed-off-by ç­¾å"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass -k flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -k å‚æ•°"
-#: builtin/am.c:2260
+#: builtin/am.c:2259
msgid "pass -b flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -b å‚æ•°"
-#: builtin/am.c:2262
+#: builtin/am.c:2261
msgid "pass -m flag to git-mailinfo"
msgstr "å‘ git-mailinfo 传递 -m å‚æ•°"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit 传递 --keep-cr å‚æ•°"
-#: builtin/am.c:2267
+#: builtin/am.c:2266
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "ä¸å‘ git-mailsplit 传递 --keep-cr å‚数,覆盖 am.keepcr 的设置"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "strip everything before a scissors line"
msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容"
-#: builtin/am.c:2271 builtin/apply.c:4544
+#: builtin/am.c:2270 builtin/apply.c:4546
msgid "action"
msgstr "动作"
-#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
-#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
-#: builtin/am.c:2299
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292
+#: builtin/am.c:2298
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2280 builtin/apply.c:4568
+#: builtin/am.c:2279 builtin/apply.c:4570
msgid "root"
msgstr "根目录"
-#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
-#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
-#: builtin/pull.c:171 builtin/submodule--helper.c:72
-#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
+#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508
+#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95
+#: builtin/pull.c:179 builtin/submodule--helper.c:277
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767
+#: builtin/submodule--helper.c:770
msgid "path"
msgstr "路径"
-#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
-#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
+#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134
+#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182
#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
#: parse-options.h:132 parse-options.h:134 parse-options.h:244
msgid "n"
msgstr "n"
-#: builtin/am.c:2292 builtin/apply.c:4512
+#: builtin/am.c:2291 builtin/apply.c:4514
msgid "num"
msgstr "æ•°å­—"
-#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438
#: builtin/tag.c:372
msgid "format"
msgstr "æ ¼å¼"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "format the patch(es) are in"
msgstr "è¡¥ä¸çš„æ ¼å¼"
-#: builtin/am.c:2302
+#: builtin/am.c:2301
msgid "override error message when patch failure occurs"
msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "continue applying patches after resolving a conflict"
msgstr "冲çªè§£å†³åŽç»§ç»­åº”用补ä¸"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "synonyms for --continue"
msgstr "å’Œ --continue åŒä¹‰"
-#: builtin/am.c:2310
+#: builtin/am.c:2309
msgid "skip the current patch"
msgstr "跳过当å‰è¡¥ä¸"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "restore the original branch and abort the patching operation."
msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ­¢æ‰“è¡¥ä¸æ“作。"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
msgid "lie about committer date"
msgstr "将作者日期作为æ交日期"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "use current timestamp for author date"
msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期"
-#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
-#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228
+#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2322
+#: builtin/am.c:2321
msgid "GPG-sign commits"
msgstr "使用 GPG ç­¾åæ交"
-#: builtin/am.c:2325
+#: builtin/am.c:2324
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase)"
-#: builtin/am.c:2340
+#: builtin/am.c:2339
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."
@@ -2976,16 +3226,16 @@ msgstr ""
"å‚æ•° -b/--binary å·²ç»å¾ˆé•¿æ—¶é—´ä¸åšä»»ä½•å®žè´¨æ“作了,并且将被移除。\n"
"请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚"
-#: builtin/am.c:2347
+#: builtin/am.c:2346
msgid "failed to read the index"
msgstr "无法读å–索引"
-#: builtin/am.c:2362
+#: builtin/am.c:2361
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å­˜åœ¨ï¼Œä½†å´æ供了 mbox。"
-#: builtin/am.c:2386
+#: builtin/am.c:2385
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -2994,7 +3244,7 @@ msgstr ""
"å‘现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2392
+#: builtin/am.c:2391
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»­ã€‚"
@@ -3027,37 +3277,37 @@ msgstr "regexec 返回 %d,输入为:%s"
msgid "unable to find filename in patch at line %d"
msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å"
-#: builtin/apply.c:940
+#: builtin/apply.c:937
#, 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"
-#: builtin/apply.c:944
+#: builtin/apply.c:942
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´"
-#: builtin/apply.c:945
+#: builtin/apply.c:943
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´"
-#: builtin/apply.c:952
+#: builtin/apply.c:949
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: builtin/apply.c:1415
+#: builtin/apply.c:1406
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:æ„外的行:%.*s"
-#: builtin/apply.c:1472
+#: builtin/apply.c:1463
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s"
-#: builtin/apply.c:1489
+#: builtin/apply.c:1480
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -3068,77 +3318,77 @@ msgid_plural ""
msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)"
-#: builtin/apply.c:1655
+#: builtin/apply.c:1646
msgid "new file depends on old contents"
msgstr "新文件ä¾èµ–旧内容"
-#: builtin/apply.c:1657
+#: builtin/apply.c:1648
msgid "deleted file still has contents"
msgstr "删除的文件ä»æœ‰å†…容"
-#: builtin/apply.c:1683
+#: builtin/apply.c:1674
#, c-format
msgid "corrupt patch at line %d"
msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå"
-#: builtin/apply.c:1719
+#: builtin/apply.c:1710
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s ä¾èµ–旧内容"
-#: builtin/apply.c:1721
+#: builtin/apply.c:1712
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s ä»æœ‰å†…容"
-#: builtin/apply.c:1724
+#: builtin/apply.c:1715
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ é™¤"
-#: builtin/apply.c:1870
+#: builtin/apply.c:1861
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s"
-#: builtin/apply.c:1899
+#: builtin/apply.c:1895
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ"
-#: builtin/apply.c:2050
+#: builtin/apply.c:2048
#, c-format
msgid "patch with only garbage at line %d"
msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®"
-#: builtin/apply.c:2140
+#: builtin/apply.c:2138
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读å–符å·é“¾æŽ¥ %s"
-#: builtin/apply.c:2144
+#: builtin/apply.c:2142
#, c-format
msgid "unable to open or read %s"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s"
-#: builtin/apply.c:2777
+#: builtin/apply.c:2775
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
-#: builtin/apply.c:2896
+#: builtin/apply.c:2894
#, 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 行)"
-#: builtin/apply.c:2908
+#: builtin/apply.c:2906
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ"
-#: builtin/apply.c:2914
+#: builtin/apply.c:2912
#, c-format
msgid ""
"while searching for:\n"
@@ -3147,319 +3397,329 @@ msgstr ""
"当查询:\n"
"%.*s"
-#: builtin/apply.c:2934
+#: builtin/apply.c:2932
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®"
-#: builtin/apply.c:3035
+#: builtin/apply.c:3033
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补ä¸æœªåº”用到 '%s'"
-#: builtin/apply.c:3041
+#: builtin/apply.c:3039
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ­£ç¡®çš„结果(应为 %s,å´ä¸º %s)"
-#: builtin/apply.c:3062
+#: builtin/apply.c:3060
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld"
-#: builtin/apply.c:3186
+#: builtin/apply.c:3184
#, c-format
msgid "cannot checkout %s"
msgstr "ä¸èƒ½æ£€å‡º %s"
-#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
+#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285
#, c-format
msgid "read of %s failed"
msgstr "è¯»å– %s 失败"
-#: builtin/apply.c:3239
+#: builtin/apply.c:3237
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸­çš„ '%s'"
-#: builtin/apply.c:3267 builtin/apply.c:3489
+#: builtin/apply.c:3265 builtin/apply.c:3487
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s å·²ç»è¢«é‡å‘½å/删除"
-#: builtin/apply.c:3348 builtin/apply.c:3503
+#: builtin/apply.c:3346 builtin/apply.c:3501
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:ä¸å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
+#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: builtin/apply.c:3357 builtin/apply.c:3511
+#: builtin/apply.c:3355 builtin/apply.c:3509
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引ä¸åŒ¹é…"
-#: builtin/apply.c:3459
+#: builtin/apply.c:3457
msgid "removal patch leaves file contents"
msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容"
-#: builtin/apply.c:3528
+#: builtin/apply.c:3526
#, c-format
msgid "%s: wrong type"
msgstr "%s:错误类型"
-#: builtin/apply.c:3530
+#: builtin/apply.c:3528
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o,应为 %o"
-#: builtin/apply.c:3689 builtin/apply.c:3691
+#: builtin/apply.c:3687 builtin/apply.c:3689
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: builtin/apply.c:3746
+#: builtin/apply.c:3744
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: builtin/apply.c:3749
+#: builtin/apply.c:3747
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已ç»å­˜åœ¨äºŽå·¥ä½œåŒºä¸­"
-#: builtin/apply.c:3769
+#: builtin/apply.c:3767
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…"
-#: builtin/apply.c:3774
+#: builtin/apply.c:3772
#, 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)ä¸åŒ¹é…"
-#: builtin/apply.c:3794
+#: builtin/apply.c:3792
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸­"
-#: builtin/apply.c:3798
+#: builtin/apply.c:3796
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:补ä¸æœªåº”用"
-#: builtin/apply.c:3812
+#: builtin/apply.c:3810
#, c-format
msgid "Checking patch %s..."
msgstr "æ£€æŸ¥è¡¥ä¸ %s..."
-#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
+#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败"
-#: builtin/apply.c:4048
+#: builtin/apply.c:4046
#, c-format
msgid "unable to remove %s from index"
msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸­ç§»é™¤ %s"
-#: builtin/apply.c:4077
+#: builtin/apply.c:4075
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "å­æ¨¡ç»„ %s æŸåçš„è¡¥ä¸"
-#: builtin/apply.c:4081
+#: builtin/apply.c:4079
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€"
-#: builtin/apply.c:4086
+#: builtin/apply.c:4084
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å­˜å‚¨"
-#: builtin/apply.c:4089 builtin/apply.c:4197
+#: builtin/apply.c:4087 builtin/apply.c:4195
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存æ¡ç›®"
-#: builtin/apply.c:4122
+#: builtin/apply.c:4120
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: builtin/apply.c:4171
+#: builtin/apply.c:4169
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o"
-#: builtin/apply.c:4258
+#: builtin/apply.c:4256
#, c-format
msgid "Applied patch %s cleanly."
msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。"
-#: builtin/apply.c:4266
+#: builtin/apply.c:4264
msgid "internal error"
msgstr "内部错误"
-#: builtin/apply.c:4269
+#: builtin/apply.c:4267
#, 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 个被拒ç»..."
-#: builtin/apply.c:4279
+#: builtin/apply.c:4277
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件å为 %.*s.rej"
-#: builtin/apply.c:4300
+#: builtin/apply.c:4285
+#, c-format
+msgid "cannot open %s: %s"
+msgstr "ä¸èƒ½æ‰“å¼€ %s:%s"
+
+#: builtin/apply.c:4298
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段æˆåŠŸåº”用。"
-#: builtin/apply.c:4303
+#: builtin/apply.c:4301
#, c-format
msgid "Rejected hunk #%d."
msgstr "æ‹’ç»ç¬¬ #%d 个片段。"
-#: builtin/apply.c:4393
+#: builtin/apply.c:4387
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "ç•¥è¿‡è¡¥ä¸ '%s'。"
+
+#: builtin/apply.c:4395
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: builtin/apply.c:4404
+#: builtin/apply.c:4406
msgid "unable to read index file"
msgstr "无法读å–索引文件"
-#: builtin/apply.c:4507
+#: builtin/apply.c:4509
msgid "don't apply changes matching the given path"
msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4510
+#: builtin/apply.c:4512
msgid "apply changes matching the given path"
msgstr "应用与给出路径å‘匹é…çš„å˜æ›´"
-#: builtin/apply.c:4513
+#: builtin/apply.c:4515
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数é‡çš„å‰å¯¼æ–œçº¿"
-#: builtin/apply.c:4516
+#: builtin/apply.c:4518
msgid "ignore additions made by the patch"
msgstr "忽略补ä¸ä¸­çš„添加的文件"
-#: builtin/apply.c:4518
+#: builtin/apply.c:4520
msgid "instead of applying the patch, output diffstat for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)"
-#: builtin/apply.c:4522
+#: builtin/apply.c:4524
msgid "show number of added and deleted lines in decimal notation"
msgstr "以å进制数显示添加和删除的行数"
-#: builtin/apply.c:4524
+#: builtin/apply.c:4526
msgid "instead of applying the patch, output a summary for the input"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦"
-#: builtin/apply.c:4526
+#: builtin/apply.c:4528
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用"
-#: builtin/apply.c:4528
+#: builtin/apply.c:4530
msgid "make sure the patch is applicable to the current index"
msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•"
-#: builtin/apply.c:4530
+#: builtin/apply.c:4532
msgid "apply a patch without touching the working tree"
msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº"
-#: builtin/apply.c:4532
+#: builtin/apply.c:4534
msgid "accept a patch that touches outside the working area"
msgstr "接å—修改工作区之外文件的补ä¸"
-#: builtin/apply.c:4534
+#: builtin/apply.c:4536
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰"
-#: builtin/apply.c:4536
+#: builtin/apply.c:4538
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶"
-#: builtin/apply.c:4538
+#: builtin/apply.c:4540
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信æ¯"
-#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
+#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: builtin/apply.c:4543
+#: builtin/apply.c:4545
msgid "ensure at least <n> lines of context match"
msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文"
-#: builtin/apply.c:4545
+#: builtin/apply.c:4547
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: builtin/apply.c:4548 builtin/apply.c:4551
+#: builtin/apply.c:4550 builtin/apply.c:4553
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的å˜æ›´"
-#: builtin/apply.c:4554
+#: builtin/apply.c:4556
msgid "apply the patch in reverse"
msgstr "åå‘应用补ä¸"
-#: builtin/apply.c:4556
+#: builtin/apply.c:4558
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: builtin/apply.c:4558
+#: builtin/apply.c:4560
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å­˜åœ¨å¯¹åº”çš„ *.rej 文件中"
-#: builtin/apply.c:4560
+#: builtin/apply.c:4562
msgid "allow overlapping hunks"
msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ"
-#: builtin/apply.c:4563
+#: builtin/apply.c:4565
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "å…许ä¸æ­£ç¡®çš„文件末尾æ¢è¡Œç¬¦"
-#: builtin/apply.c:4566
+#: builtin/apply.c:4568
msgid "do not trust the line counts in the hunk headers"
msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸­çš„è¡Œå·"
-#: builtin/apply.c:4569
+#: builtin/apply.c:4571
msgid "prepend <root> to all filenames"
msgstr "为所有文件åå‰æ·»åŠ  <根目录>"
-#: builtin/apply.c:4591
+#: builtin/apply.c:4593
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: builtin/apply.c:4599
+#: builtin/apply.c:4601
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: builtin/apply.c:4602
+#: builtin/apply.c:4604
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: builtin/apply.c:4621
+#: builtin/apply.c:4623
#, c-format
msgid "can't open patch '%s'"
msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'"
-#: builtin/apply.c:4635
+#: builtin/apply.c:4637
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下ä»æœ‰ %d 个空白字符误用"
msgstr[1] "抑制下ä»æœ‰ %d 个空白字符误用"
-#: builtin/apply.c:4641 builtin/apply.c:4651
+#: builtin/apply.c:4643 builtin/apply.c:4653
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -3525,99 +3785,99 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
msgid "Blaming lines"
msgstr "追踪代ç è¡Œ"
-#: builtin/blame.c:2530
+#: builtin/blame.c:2531
msgid "Show blame entries as we find them, incrementally"
msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®"
-#: builtin/blame.c:2531
+#: builtin/blame.c:2532
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界æ交显示空的 SHA-1(默认:关闭)"
-#: builtin/blame.c:2532
+#: builtin/blame.c:2533
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关闭)"
-#: builtin/blame.c:2533
+#: builtin/blame.c:2534
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:2534
+#: builtin/blame.c:2535
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:2535
+#: builtin/blame.c:2536
msgid "Show output score for blame entries"
msgstr "显示判断 blame æ¡ç›®ä½ç§»çš„得分诊断信æ¯"
-#: builtin/blame.c:2536
+#: builtin/blame.c:2537
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件å(默认:自动)"
-#: builtin/blame.c:2537
+#: builtin/blame.c:2538
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2538
+#: builtin/blame.c:2539
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼"
-#: builtin/blame.c:2539
+#: builtin/blame.c:2540
msgid "Show porcelain format with per-line commit information"
msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯"
-#: builtin/blame.c:2540
+#: builtin/blame.c:2541
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2541
+#: builtin/blame.c:2542
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
-#: builtin/blame.c:2542
+#: builtin/blame.c:2543
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—­ï¼‰"
-#: builtin/blame.c:2543
+#: builtin/blame.c:2544
msgid "Suppress author name and timestamp (Default: off)"
msgstr "éšè—作者å字和时间戳(默认:关闭)"
-#: builtin/blame.c:2544
+#: builtin/blame.c:2545
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而ä¸æ˜¯å字(默认:关闭)"
-#: builtin/blame.c:2545
+#: builtin/blame.c:2546
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:2546
+#: builtin/blame.c:2547
msgid "Spend extra cycles to find better match"
msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…"
-#: builtin/blame.c:2547
+#: builtin/blame.c:2548
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list"
-#: builtin/blame.c:2548
+#: builtin/blame.c:2549
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:2549 builtin/blame.c:2550
+#: builtin/blame.c:2550 builtin/blame.c:2551
msgid "score"
msgstr "得分"
-#: builtin/blame.c:2549
+#: builtin/blame.c:2550
msgid "Find line copies within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´"
-#: builtin/blame.c:2550
+#: builtin/blame.c:2551
msgid "Find line movements within and across files"
msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2551
+#: builtin/blame.c:2552
msgid "Process only line range n,m, counting from 1"
msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
@@ -3627,32 +3887,32 @@ msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始"
#. 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:2640
+#: builtin/blame.c:2641
msgid "4 years, 11 months ago"
msgstr "4 å¹´ 11 个月å‰"
-#: builtin/branch.c:25
+#: builtin/branch.c:26
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:26
+#: builtin/branch.c:27
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..."
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
# 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让字符串å˜é•¿
-#: builtin/branch.c:142
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -3662,7 +3922,7 @@ msgstr ""
" '%s',但未åˆå¹¶åˆ° HEAD。"
# 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让字符串å˜é•¿
-#: builtin/branch.c:146
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -3671,12 +3931,12 @@ msgstr ""
"并未删除分支 '%s', 虽然它已ç»åˆå¹¶åˆ° HEAD,\n"
" 然而å´å°šæœªè¢«åˆå¹¶åˆ°åˆ†æ”¯ '%s' 。"
-#: builtin/branch.c:160
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指å‘çš„æ交对象"
-#: builtin/branch.c:164
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -3685,335 +3945,356 @@ msgstr ""
"分支 '%s' 没有完全åˆå¹¶ã€‚\n"
"如果您确认è¦åˆ é™¤å®ƒï¼Œæ‰§è¡Œ 'git branch -D %s'。"
-#: builtin/branch.c:177
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr "无法更新 config 文件"
-#: builtin/branch.c:205
+#: builtin/branch.c:206
msgid "cannot use -a with -d"
msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指å‘çš„æ交对象"
-#: builtin/branch.c:219
+#: builtin/branch.c:226
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
-msgstr "无法删除您当å‰æ‰€åœ¨çš„分支 '%s'。"
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:235
+#: builtin/branch.c:241
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:236
+#: builtin/branch.c:242
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未å‘现。"
-#: builtin/branch.c:251
+#: builtin/branch.c:257
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:258
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:259
+#: builtin/branch.c:265
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:260
+#: builtin/branch.c:266
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s(曾为 %s)。\n"
-#: builtin/branch.c:303
+#: builtin/branch.c:309
#, c-format
msgid "[%s: gone]"
msgstr "[%s: 丢失]"
-#: builtin/branch.c:308
+#: builtin/branch.c:314
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:313
+#: builtin/branch.c:319
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s:è½åŽ %d]"
-#: builtin/branch.c:315
+#: builtin/branch.c:321
#, c-format
msgid "[behind %d]"
msgstr "[è½åŽ %d]"
-#: builtin/branch.c:319
+#: builtin/branch.c:325
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s:领先 %d]"
-#: builtin/branch.c:321
+#: builtin/branch.c:327
#, c-format
msgid "[ahead %d]"
msgstr "[领先 %d]"
-#: builtin/branch.c:324
+#: builtin/branch.c:330
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s:领先 %d,è½åŽ %d]"
-#: builtin/branch.c:327
+#: builtin/branch.c:333
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[领先 %d,è½åŽ %d]"
-#: builtin/branch.c:340
+#: builtin/branch.c:346
msgid " **** invalid ref ****"
msgstr " **** 无效引用 ****"
-#: builtin/branch.c:366
+#: builtin/branch.c:372
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(éžåˆ†æ”¯ï¼Œæ­£å˜åŸº %s)"
-#: builtin/branch.c:369
+#: builtin/branch.c:375
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)"
-#: builtin/branch.c:375
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:381
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(头指针分离于 %s)"
-#: builtin/branch.c:378
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:386
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(头指针分离自 %s)"
-#: builtin/branch.c:382
+#: builtin/branch.c:390
msgid "(no branch)"
msgstr "(éžåˆ†æ”¯ï¼‰"
-#: builtin/branch.c:524
+#: builtin/branch.c:541
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "分支 %s 正被å˜åŸºåˆ° %s"
+
+#: builtin/branch.c:545
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "分支 %s 正被二分查找于 %s"
+
+#: builtin/branch.c:560
msgid "cannot rename the current branch while not on any."
msgstr "无法é‡å‘½å当å‰åˆ†æ”¯å› ä¸ºä¸å¤„于任何分支上。"
-#: builtin/branch.c:534
+#: builtin/branch.c:570
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支å:'%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:587
msgid "Branch rename failed"
msgstr "分支é‡å‘½å失败"
-#: builtin/branch.c:553
+#: builtin/branch.c:591
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'"
-#: builtin/branch.c:557
+#: builtin/branch.c:594
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼"
-#: builtin/branch.c:564
+#: builtin/branch.c:601
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被é‡å‘½å,但更新 config 文件失败"
-#: builtin/branch.c:586
-#, c-format
-msgid "could not write branch description template: %s"
-msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版:%s"
+#: builtin/branch.c:623
+msgid "could not write branch description template"
+msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版"
-#: builtin/branch.c:615
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:617
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若å‚数出现两次则显示上游分支"
-#: builtin/branch.c:618
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯"
-#: builtin/branch.c:619
+#: builtin/branch.c:655
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1))"
-#: builtin/branch.c:621
+#: builtin/branch.c:657
msgid "change upstream info"
msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯"
-#: builtin/branch.c:625
+#: builtin/branch.c:659
+msgid "upstream"
+msgstr "上游"
+
+#: builtin/branch.c:659
+msgid "change the upstream info"
+msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯"
+
+#: builtin/branch.c:661
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:626
+#: builtin/branch.c:662
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:628 builtin/branch.c:629
+#: builtin/branch.c:664 builtin/branch.c:665
msgid "print only branches that contain the commit"
msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支"
-#: builtin/branch.c:632
+#: builtin/branch.c:668
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
-#: builtin/branch.c:633
+#: builtin/branch.c:669
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯"
-#: builtin/branch.c:635
+#: builtin/branch.c:671
msgid "delete fully merged branch"
msgstr "删除完全åˆå¹¶çš„分支"
-#: builtin/branch.c:636
+#: builtin/branch.c:672
msgid "delete branch (even if not merged)"
msgstr "删除分支(å³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰"
-#: builtin/branch.c:637
+#: builtin/branch.c:673
msgid "move/rename a branch and its reflog"
msgstr "移动/é‡å‘½å一个分支,以åŠå®ƒçš„引用日志"
-#: builtin/branch.c:638
+#: builtin/branch.c:674
msgid "move/rename a branch, even if target exists"
msgstr "移动/é‡å‘½å一个分支,å³ä½¿ç›®æ ‡å·²å­˜åœ¨"
-#: builtin/branch.c:639
+#: builtin/branch.c:675
msgid "list branch names"
msgstr "列出分支å"
-#: builtin/branch.c:640
+#: builtin/branch.c:676
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:642
+#: builtin/branch.c:678
msgid "edit the description for the branch"
msgstr "标记分支的æè¿°"
-#: builtin/branch.c:643
+#: builtin/branch.c:679
msgid "force creation, move/rename, deletion"
msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ é™¤"
-#: builtin/branch.c:644
+#: builtin/branch.c:680
msgid "print only branches that are merged"
msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„分支"
-#: builtin/branch.c:645
+#: builtin/branch.c:681
msgid "print only branches that are not merged"
msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„分支"
-#: builtin/branch.c:646
+#: builtin/branch.c:682
msgid "list branches in columns"
msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯"
-#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
msgid "key"
msgstr "key"
-#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
msgid "field name to sort on"
msgstr "排åºçš„字段å"
-#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
+#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401
#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
#: builtin/tag.c:369
msgid "object"
msgstr "对象"
-#: builtin/branch.c:651
+#: builtin/branch.c:687
msgid "print only branches of the object"
msgstr "åªæ‰“å°æŒ‡å‘该对象的分支"
-#: builtin/branch.c:669
+#: builtin/branch.c:705
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚"
-#: builtin/branch.c:673 builtin/clone.c:705
+#: builtin/branch.c:709 builtin/clone.c:707
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼"
-#: builtin/branch.c:693
+#: builtin/branch.c:729
msgid "--column and --verbose are incompatible"
msgstr "--column å’Œ --verbose ä¸å…¼å®¹"
-#: builtin/branch.c:704 builtin/branch.c:746
+#: builtin/branch.c:740 builtin/branch.c:782
msgid "branch name required"
msgstr "å¿…é¡»æ供分支å"
-#: builtin/branch.c:722
+#: builtin/branch.c:758
msgid "Cannot give description to detached HEAD"
msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°"
-#: builtin/branch.c:727
+#: builtin/branch.c:763
msgid "cannot edit description of more than one branch"
msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°"
-#: builtin/branch.c:734
+#: builtin/branch.c:770
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' å°šæ— æ交。"
-#: builtin/branch.c:737
+#: builtin/branch.c:773
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:752
+#: builtin/branch.c:788
msgid "too many branches for a rename operation"
msgstr "为é‡å‘½åæ“作æ供了太多的分支å"
-#: builtin/branch.c:757
+#: builtin/branch.c:793
msgid "too many branches to set new upstream"
msgstr "为设置新上游æ供了太多的分支å"
-#: builtin/branch.c:761
+#: builtin/branch.c:797
#, 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:764 builtin/branch.c:786 builtin/branch.c:807
+#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:768
+#: builtin/branch.c:804
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' ä¸å­˜åœ¨"
-#: builtin/branch.c:780
+#: builtin/branch.c:816
msgid "too many branches to unset upstream"
msgstr "为å–消上游设置æ“作æ供了太多的分支å"
-#: builtin/branch.c:784
+#: builtin/branch.c:820
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法å–消 HEAD 的上游设置因为它没有指å‘一个分支"
-#: builtin/branch.c:790
+#: builtin/branch.c:826
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信æ¯"
-#: builtin/branch.c:804
+#: builtin/branch.c:840
msgid "it does not make sense to create 'HEAD' manually"
msgstr "手工创建 'HEAD' 没有æ„义"
-#: builtin/branch.c:810
+#: builtin/branch.c:846
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义"
-#: builtin/branch.c:813
+#: builtin/branch.c:849
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -4021,7 +4302,7 @@ msgid ""
msgstr ""
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-#: builtin/branch.c:830
+#: builtin/branch.c:866
#, c-format
msgid ""
"\n"
@@ -4032,16 +4313,6 @@ msgstr ""
"如果你想用 '%s' 跟踪 '%s', 这么åšï¼š\n"
"\n"
-#: builtin/branch.c:831
-#, c-format
-msgid " git branch -d %s\n"
-msgstr " git branch -d %s\n"
-
-#: builtin/branch.c:832
-#, c-format
-msgid " git branch --set-upstream-to %s\n"
-msgstr " git branch --set-upstream-to %s\n"
-
#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
@@ -4139,7 +4410,7 @@ msgstr "从标准输入读出文件å"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
+#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325
msgid "suppress progress reporting"
msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š"
@@ -4229,8 +4500,9 @@ msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
-#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
+#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494
+#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:774
msgid "string"
msgstr "字符串"
@@ -4280,80 +4552,80 @@ msgstr "path '%s':无法åˆå¹¶"
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加åˆå¹¶ç»“æžœ"
-#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
-#: builtin/checkout.c:260
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用"
-#: builtin/checkout.c:263 builtin/checkout.c:266
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:268
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。"
-#: builtin/checkout.c:280 builtin/checkout.c:474
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "æŸå的索引文件"
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未åˆå¹¶"
-#: builtin/checkout.c:496
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª"
-#: builtin/checkout.c:623
+#: builtin/checkout.c:622
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作:%s\n"
-#: builtin/checkout.c:661
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD ç›®å‰ä½äºŽ"
-#: builtin/checkout.c:665 builtin/clone.c:659
+#: builtin/checkout.c:664 builtin/clone.c:661
msgid "unable to update HEAD"
msgstr "ä¸èƒ½æ›´æ–° HEAD"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:668
#, c-format
msgid "Reset branch '%s'\n"
msgstr "é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:672
+#: builtin/checkout.c:671
#, c-format
msgid "Already on '%s'\n"
msgstr "å·²ç»ä½äºŽ '%s'\n"
-#: builtin/checkout.c:676
+#: builtin/checkout.c:675
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:678 builtin/checkout.c:1068
+#: builtin/checkout.c:677 builtin/checkout.c:1067
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:679
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/checkout.c:732
+#: builtin/checkout.c:731
#, c-format
msgid " ... and %d more.\n"
msgstr " ... åŠå…¶å®ƒ %d 个。\n"
-#: builtin/checkout.c:738
+#: builtin/checkout.c:737
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -4374,7 +4646,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:757
+#: builtin/checkout.c:756
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4401,150 +4673,150 @@ msgstr[1] ""
" git branch <新分支å> %s\n"
"\n"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:792
msgid "internal error in revision walk"
msgstr "在版本é历时é‡åˆ°å†…部错误"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:796
msgid "Previous HEAD position was"
msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯"
-#: builtin/checkout.c:824 builtin/checkout.c:1063
+#: builtin/checkout.c:823 builtin/checkout.c:1062
msgid "You are on a branch yet to be born"
msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支"
-#: builtin/checkout.c:969
+#: builtin/checkout.c:968
#, c-format
msgid "only one reference expected, %d given."
msgstr "åªè¦ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个"
-#: builtin/checkout.c:1009 builtin/worktree.c:211
+#: builtin/checkout.c:1008 builtin/worktree.c:212
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1037
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s"
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1076
msgid "paths cannot be used with switching branches"
msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1080 builtin/checkout.c:1084
+#: builtin/checkout.c:1079 builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095
+#: builtin/checkout.c:1098
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1103
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'"
-#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
-#: builtin/worktree.c:320
+#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323
+#: builtin/worktree.c:325
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1138
+#: builtin/checkout.c:1137
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1139
msgid "create/reset and checkout a branch"
msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1140
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1141
msgid "detach the HEAD at named commit"
msgstr "æˆä¸ºæŒ‡å‘该æ交的分离头指针"
-#: builtin/checkout.c:1143
+#: builtin/checkout.c:1142
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信æ¯"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1144
msgid "new unparented branch"
msgstr "新的没有父æ交的分支"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1145
msgid "checkout our version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出我们的版本"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1147
msgid "checkout their version for unmerged files"
msgstr "对尚未åˆå¹¶çš„文件检出他们的版本"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1149
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1150
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方åˆå¹¶"
-#: builtin/checkout.c:1152 builtin/merge.c:227
+#: builtin/checkout.c:1151 builtin/merge.c:230
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
-#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
+#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1153
msgid "conflict style (merge or diff3)"
msgstr "冲çªè¾“出风格(merge 或 diff3)"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1156
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶"
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1158
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1160
msgid "do not check if another worktree is holding the given ref"
msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å ç”¨"
-#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
-#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
+#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116
+#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1192
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-bã€-B å’Œ --orphan 是互斥的"
-#: builtin/checkout.c:1210
+#: builtin/checkout.c:1209
msgid "--track needs a branch name"
msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1214
msgid "Missing branch name; try -b"
msgstr "缺少分支åï¼›å°è¯• -b"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1250
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1258
+#: builtin/checkout.c:1257
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
@@ -4553,12 +4825,12 @@ msgstr ""
"ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n"
"您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么?"
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1262
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1266
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -4709,8 +4981,8 @@ msgstr "交互å¼æ¸…除"
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
-#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
+#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182
msgid "pattern"
msgstr "模å¼"
@@ -4748,104 +5020,113 @@ msgstr ""
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:60
+#: builtin/clone.c:62
msgid "don't create a checkout"
msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º"
-#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
+#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:65
+#: builtin/clone.c:67
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜åƒä»“库(也是纯仓库)"
-#: builtin/clone.c:67
+#: builtin/clone.c:69
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:69
+#: builtin/clone.c:71
msgid "don't use local hardlinks, always copy"
msgstr "ä¸ä½¿ç”¨æœ¬åœ°ç¡¬é“¾æŽ¥ï¼Œå§‹ç»ˆå¤åˆ¶"
-#: builtin/clone.c:71
+#: builtin/clone.c:73
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:73 builtin/clone.c:75
+#: builtin/clone.c:75 builtin/clone.c:77
msgid "initialize submodules in the clone"
msgstr "在克隆时åˆå§‹åŒ–å­æ¨¡ç»„"
-#: builtin/clone.c:76 builtin/init-db.c:466
+#: builtin/clone.c:79
+msgid "number of submodules cloned in parallel"
+msgstr "并å‘克隆的å­æ¨¡ç»„çš„æ•°é‡"
+
+#: builtin/clone.c:80 builtin/init-db.c:470
msgid "template-directory"
msgstr "模æ¿ç›®å½•"
-#: builtin/clone.c:77 builtin/init-db.c:467
+#: builtin/clone.c:81 builtin/init-db.c:471
msgid "directory from which templates will be used"
msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨"
-#: builtin/clone.c:79 builtin/submodule--helper.c:173
+#: builtin/clone.c:83 builtin/submodule--helper.c:498
+#: builtin/submodule--helper.c:777
msgid "reference repository"
msgstr "å‚考仓库"
-#: builtin/clone.c:81
+#: builtin/clone.c:85
msgid "use --reference only while cloning"
msgstr "仅在克隆时å‚考 --reference 指å‘的本地仓库"
-#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "å称"
-#: builtin/clone.c:83
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <å称> 而ä¸æ˜¯ 'origin' 去跟踪上游"
-#: builtin/clone.c:85
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD"
-#: builtin/clone.c:87
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
-#: builtin/pull.c:193
+#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667
+#: builtin/pull.c:201
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:91
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch"
-#: builtin/clone.c:92 builtin/init-db.c:475
+#: builtin/clone.c:97
+msgid "any cloned submodules will be shallow"
+msgstr "å­æ¨¡ç»„将以浅下载模å¼å…‹éš†"
+
+#: builtin/clone.c:98 builtin/init-db.c:479
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:93 builtin/init-db.c:476
+#: builtin/clone.c:99 builtin/init-db.c:480
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:94
+#: builtin/clone.c:100
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:95
+#: builtin/clone.c:101
msgid "set config inside the new repository"
msgstr "在新仓库中设置é…置信æ¯"
-#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
+#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536
msgid "use IPv4 addresses only"
msgstr "åªä½¿ç”¨ IPv4 地å€"
-#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
+#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538
msgid "use IPv6 addresses only"
msgstr "åªä½¿ç”¨ IPv6 地å€"
-#: builtin/clone.c:239
+#: builtin/clone.c:241
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -4853,57 +5134,52 @@ msgstr ""
"无法猜到目录å。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:305
+#: builtin/clone.c:307
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "å°šä¸æ”¯æŒå°†å‚考仓库 '%s' 作为一个链接检出。"
-#: builtin/clone.c:307
+#: builtin/clone.c:309
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "å‚考仓库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ä»“库。"
-#: builtin/clone.c:312
+#: builtin/clone.c:314
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "å‚考仓库 '%s' 是一个浅克隆"
-#: builtin/clone.c:315
+#: builtin/clone.c:317
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "å‚考仓库 '%s' 已被å«æŽ¥"
-#: builtin/clone.c:380 builtin/diff.c:84
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "无法枚举 '%s' 状æ€"
-
-#: builtin/clone.c:382
+#: builtin/clone.c:384
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且ä¸æ˜¯ä¸€ä¸ªç›®å½•"
-#: builtin/clone.c:396
+#: builtin/clone.c:398
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状æ€\n"
-#: builtin/clone.c:418
+#: builtin/clone.c:420
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:422
+#: builtin/clone.c:424
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷è´æ–‡ä»¶è‡³ '%s'"
-#: builtin/clone.c:447 builtin/clone.c:631
+#: builtin/clone.c:449 builtin/clone.c:633
#, c-format
msgid "done.\n"
msgstr "完æˆã€‚\n"
-#: builtin/clone.c:459
+#: builtin/clone.c:461
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -4913,126 +5189,126 @@ msgstr ""
"您å¯ä»¥é€šè¿‡ 'git status' 检查哪些已被检出,然åŽä½¿ç”¨å‘½ä»¤\n"
"'git checkout -f HEAD' é‡è¯•\n"
-#: builtin/clone.c:536
+#: builtin/clone.c:538
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。"
-#: builtin/clone.c:626
+#: builtin/clone.c:628
#, c-format
msgid "Checking connectivity... "
msgstr "检查连接... "
-#: builtin/clone.c:629
+#: builtin/clone.c:631
msgid "remote did not send all necessary objects"
msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象"
-#: builtin/clone.c:647
+#: builtin/clone.c:649
#, c-format
msgid "unable to update %s"
msgstr "ä¸èƒ½æ›´æ–° %s"
-#: builtin/clone.c:696
+#: builtin/clone.c:698
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指å‘一个ä¸å­˜åœ¨çš„引用,无法检出。\n"
-#: builtin/clone.c:727
+#: builtin/clone.c:729
msgid "unable to checkout working tree"
msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº"
-#: builtin/clone.c:753
+#: builtin/clone.c:767
msgid "unable to write parameters to config file"
msgstr "无法将å‚数写入é…置文件"
-#: builtin/clone.c:816
+#: builtin/clone.c:830
msgid "cannot repack to clean up"
msgstr "无法执行 repack æ¥æ¸…ç†"
-#: builtin/clone.c:818
+#: builtin/clone.c:832
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:850
+#: builtin/clone.c:864 builtin/receive-pack.c:1731
msgid "Too many arguments."
msgstr "太多å‚数。"
-#: builtin/clone.c:854
+#: builtin/clone.c:868
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚"
-#: builtin/clone.c:865
+#: builtin/clone.c:879
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:868
+#: builtin/clone.c:882
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚"
-#: builtin/clone.c:881
+#: builtin/clone.c:895
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' ä¸å­˜åœ¨"
-#: builtin/clone.c:887 builtin/fetch.c:1174
+#: builtin/clone.c:901 builtin/fetch.c:1174
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ­£æ•°"
-#: builtin/clone.c:897
+#: builtin/clone.c:911
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' å·²ç»å­˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚"
-#: builtin/clone.c:907
+#: builtin/clone.c:921
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' å·²ç»å­˜åœ¨ã€‚"
-#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
-#: builtin/worktree.c:219 builtin/worktree.c:246
+#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547
+#: builtin/worktree.c:220 builtin/worktree.c:247
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录"
-#: builtin/clone.c:925
+#: builtin/clone.c:939
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:957
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:945
+#: builtin/clone.c:959
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:984
+#: builtin/clone.c:998
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。"
-#: builtin/clone.c:987
+#: builtin/clone.c:1001
msgid "source repository is shallow, ignoring --local"
msgstr "æºä»“库是浅克隆,忽略 --local"
-#: builtin/clone.c:992
+#: builtin/clone.c:1006
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:996
+#: builtin/clone.c:1010
#, c-format
msgid "Don't know how to clone %s"
msgstr "ä¸çŸ¥é“如何克隆 %s"
-#: builtin/clone.c:1045 builtin/clone.c:1053
+#: builtin/clone.c:1059 builtin/clone.c:1067
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未å‘现"
-#: builtin/clone.c:1056
+#: builtin/clone.c:1070
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -5166,103 +5442,103 @@ msgstr ""
"然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继续对其余æ交执行拣选\n"
"æ“作。\n"
-#: builtin/commit.c:305
+#: builtin/commit.c:307
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:346
+#: builtin/commit.c:348
msgid "unable to create temporary index"
msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•"
-#: builtin/commit.c:352
+#: builtin/commit.c:354
msgid "interactive add failed"
msgstr "交互å¼æ·»åŠ å¤±è´¥"
-#: builtin/commit.c:365
+#: builtin/commit.c:367
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:367
+#: builtin/commit.c:369
msgid "Failed to update main cache tree"
msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓存"
-#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:445
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a merge."
msgstr "在åˆå¹¶è¿‡ç¨‹ä¸­ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:447
+#: builtin/commit.c:449
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中ä¸èƒ½åšéƒ¨åˆ†æ交。"
-#: builtin/commit.c:456
+#: builtin/commit.c:458
msgid "cannot read the index"
msgstr "无法读å–索引"
-#: builtin/commit.c:475
+#: builtin/commit.c:477
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:580
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "æ交 '%s' 缺少作者信æ¯"
-#: builtin/commit.c:582
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯"
-#: builtin/commit.c:601
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "éžæ³•çš„ --author å‚æ•°"
-#: builtin/commit.c:609
+#: builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格å¼ï¼š%s"
-#: builtin/commit.c:653
+#: builtin/commit.c:655
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当å‰æ交说明使用的注释字符"
-#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091
#, c-format
msgid "could not lookup commit %s"
msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s"
-#: builtin/commit.c:702 builtin/shortlog.c:285
+#: builtin/commit.c:704 builtin/shortlog.c:285
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读å–日志信æ¯ï¼‰\n"
-#: builtin/commit.c:704
+#: builtin/commit.c:706
msgid "could not read log from standard input"
msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“入中读å–日志信æ¯"
-#: builtin/commit.c:708
+#: builtin/commit.c:710
#, c-format
msgid "could not read log file '%s'"
msgstr "ä¸èƒ½è¯»å–日志文件 '%s'"
-#: builtin/commit.c:730
-msgid "could not read MERGE_MSG"
-msgstr "ä¸èƒ½è¯»å– MERGE_MSG"
-
-#: builtin/commit.c:734
+#: builtin/commit.c:737 builtin/commit.c:745
msgid "could not read SQUASH_MSG"
msgstr "ä¸èƒ½è¯»å– SQUASH_MSG"
-#: builtin/commit.c:785
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
+msgstr "ä¸èƒ½è¯»å– MERGE_MSG"
+
+#: builtin/commit.c:796
msgid "could not write commit template"
msgstr "ä¸èƒ½å†™æ交模版"
-#: builtin/commit.c:803
+#: builtin/commit.c:814
#, c-format
msgid ""
"\n"
@@ -5276,7 +5552,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:808
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -5290,7 +5566,7 @@ msgstr ""
"\t%s\n"
"然åŽé‡è¯•ã€‚\n"
-#: builtin/commit.c:821
+#: builtin/commit.c:832
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5299,7 +5575,7 @@ msgstr ""
"请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略,而一个空的æ交\n"
"说明将会终止æ交。\n"
-#: builtin/commit.c:828
+#: builtin/commit.c:839
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -5310,346 +5586,346 @@ msgstr ""
"也å¯ä»¥åˆ é™¤å®ƒä»¬ã€‚一个空的æ交说明将会终止æ交。\n"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:848
+#: builtin/commit.c:859
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:856
+#: builtin/commit.c:867
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 译者:为ä¿è¯åœ¨è¾“出中对é½ï¼Œæ³¨æ„调整å¥ä¸­ç©ºæ ¼ï¼
-#: builtin/commit.c:863
+#: builtin/commit.c:874
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sæ交者:%.*s <%.*s>"
-#: builtin/commit.c:881
+#: builtin/commit.c:892
msgid "Cannot read index"
msgstr "无法读å–索引"
-#: builtin/commit.c:938
+#: builtin/commit.c:949
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:953 builtin/tag.c:266
+#: builtin/commit.c:964 builtin/tag.c:266
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1066
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者中找到匹é…"
-#: builtin/commit.c:1070 builtin/commit.c:1310
+#: builtin/commit.c:1081 builtin/commit.c:1321
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件å‚æ•° '%s'"
-#: builtin/commit.c:1107
+#: builtin/commit.c:1118
msgid "--long and -z are incompatible"
msgstr "--long å’Œ -z 选项ä¸å…¼å®¹"
-#: builtin/commit.c:1137
+#: builtin/commit.c:1148
msgid "Using both --reset-author and --author does not make sense"
msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义"
-#: builtin/commit.c:1146
+#: builtin/commit.c:1157
msgid "You have nothing to amend."
msgstr "您没有å¯ä¿®è¡¥çš„æ交。"
-#: builtin/commit.c:1149
+#: builtin/commit.c:1160
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个åˆå¹¶è¿‡ç¨‹ä¸­ -- 无法修补æ交。"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1162
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补æ交。"
-#: builtin/commit.c:1154
+#: builtin/commit.c:1165
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨"
-#: builtin/commit.c:1164
+#: builtin/commit.c:1175
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1166
+#: builtin/commit.c:1177
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1174
+#: builtin/commit.c:1185
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/commit.c:1191
+#: builtin/commit.c:1202
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1193
+#: builtin/commit.c:1204
msgid "No paths with --include/--only does not make sense."
msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。"
-#: builtin/commit.c:1195
+#: builtin/commit.c:1206
msgid "Clever... amending the last one with dirty index."
msgstr "èªæ˜Ž... 用è„索引修补最åŽä¸€ä¸ªæ交。"
-#: builtin/commit.c:1197
+#: builtin/commit.c:1208
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
-#: builtin/commit.c:1209 builtin/tag.c:475
+#: builtin/commit.c:1220 builtin/tag.c:474
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清ç†æ¨¡å¼ %s"
-#: builtin/commit.c:1214
+#: builtin/commit.c:1225
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。"
-#: builtin/commit.c:1324 builtin/commit.c:1605
+#: builtin/commit.c:1335 builtin/commit.c:1621
msgid "show status concisely"
msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€"
-#: builtin/commit.c:1326 builtin/commit.c:1607
+#: builtin/commit.c:1337 builtin/commit.c:1623
msgid "show branch information"
msgstr "显示分支信æ¯"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
-#: builtin/worktree.c:430
+#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512
+#: builtin/worktree.c:437
msgid "machine-readable output"
msgstr "机器å¯è¯»çš„输出"
-#: builtin/commit.c:1331 builtin/commit.c:1611
+#: builtin/commit.c:1342 builtin/commit.c:1627
msgid "show status in long format (default)"
msgstr "以长格å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰"
-#: builtin/commit.c:1334 builtin/commit.c:1614
+#: builtin/commit.c:1345 builtin/commit.c:1630
msgid "terminate entries with NUL"
msgstr "æ¡ç›®ä»¥ NUL 字符结尾"
-#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
+#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981
#: builtin/fast-export.c:984 builtin/tag.c:353
msgid "mode"
msgstr "模å¼"
-#: builtin/commit.c:1337 builtin/commit.c:1617
+#: builtin/commit.c:1348 builtin/commit.c:1633
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1351
msgid "show ignored files"
msgstr "显示忽略的文件"
-#: builtin/commit.c:1341 parse-options.h:155
+#: builtin/commit.c:1352 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1342
+#: builtin/commit.c:1353
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略å­æ¨¡ç»„的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)"
-#: builtin/commit.c:1344
+#: builtin/commit.c:1355
msgid "list untracked files in columns"
msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件"
-#: builtin/commit.c:1430
+#: builtin/commit.c:1441
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的æ交"
-#: builtin/commit.c:1432
+#: builtin/commit.c:1443
msgid "could not parse newly created commit"
msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1488
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/commit.c:1480
+#: builtin/commit.c:1491
msgid " (root-commit)"
msgstr "(根æ交)"
-#: builtin/commit.c:1575
+#: builtin/commit.c:1591
msgid "suppress summary after successful commit"
msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯"
-#: builtin/commit.c:1576
+#: builtin/commit.c:1592
msgid "show diff in commit message template"
msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1594
msgid "Commit message options"
msgstr "æ交说明选项"
-#: builtin/commit.c:1579 builtin/tag.c:351
+#: builtin/commit.c:1595 builtin/tag.c:351
msgid "read message from file"
msgstr "从文件中读å–æ交说明"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1580
+#: builtin/commit.c:1596
msgid "override author for commit"
msgstr "æ交时覆盖作者"
-#: builtin/commit.c:1581 builtin/gc.c:326
+#: builtin/commit.c:1597 builtin/gc.c:326
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1597
msgid "override date for commit"
msgstr "æ交时覆盖日期"
-#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
+#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395
#: builtin/notes.c:558 builtin/tag.c:349
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1598
msgid "commit message"
msgstr "æ交说明"
-#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
-#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
+#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601
+#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79
msgid "commit"
msgstr "æ交"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1599
msgid "reuse and edit message from specified commit"
msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1600
msgid "reuse message from specified commit"
msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1601
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修正指定的æ交"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1602
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1603
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)"
-#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
+#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: ç­¾å"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1605
msgid "use specified template file"
msgstr "使用指定的模æ¿æ–‡ä»¶"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1606
msgid "force edit of commit"
msgstr "强制编辑æ交"
# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文中笔误,应为 mode)
-#: builtin/commit.c:1591
+#: builtin/commit.c:1607
msgid "default"
msgstr "default"
-#: builtin/commit.c:1591 builtin/tag.c:354
+#: builtin/commit.c:1607 builtin/tag.c:354
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除æ交说明里的空格和#注释"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1608
msgid "include status in commit message template"
msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯"
-#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
+#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165
#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG æ交签å"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1613
msgid "Commit contents options"
msgstr "æ交内容选项"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1614
msgid "commit all changed files"
msgstr "æ交所有改动的文件"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1615
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待æ交"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1616
msgid "interactively add files"
msgstr "交互å¼æ·»åŠ æ–‡ä»¶"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1617
msgid "interactively add changes"
msgstr "交互å¼æ·»åŠ å˜æ›´"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1618
msgid "commit only specified files"
msgstr "åªæ交指定的文件"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1619
msgid "bypass pre-commit hook"
msgstr "绕过 pre-commit é’©å­"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1620
msgid "show what would be committed"
msgstr "显示将è¦æ交的内容"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1631
msgid "amend previous commit"
msgstr "修改先å‰çš„æ交"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1632
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite é’©å­"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1637
msgid "ok to record an empty change"
msgstr "å…许一个空æ交"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1639
msgid "ok to record a change with an empty message"
msgstr "å…许空的æ交说明"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1668
msgid "could not parse HEAD commit"
msgstr "ä¸èƒ½è§£æž HEAD æ交"
-#: builtin/commit.c:1698
+#: builtin/commit.c:1718
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "æŸåçš„ MERGE_HEAD 文件(%s)"
-#: builtin/commit.c:1705
+#: builtin/commit.c:1725
msgid "could not read MERGE_MODE"
msgstr "ä¸èƒ½è¯»å– MERGE_MODE"
-#: builtin/commit.c:1724
+#: builtin/commit.c:1744
#, c-format
msgid "could not read commit message: %s"
msgstr "ä¸èƒ½è¯»å–æ交说明:%s"
-#: builtin/commit.c:1735
+#: builtin/commit.c:1755
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n"
-#: builtin/commit.c:1740
+#: builtin/commit.c:1760
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止æ交因为æ交说明为空。\n"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1808
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -5794,7 +6070,7 @@ msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令
msgid "unable to parse default color value"
msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼"
-#: builtin/config.c:469
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -5809,7 +6085,7 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:614
#, c-format
msgid "cannot create configuration file %s"
msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s"
@@ -5845,7 +6121,7 @@ msgstr "附注标签 %s 没有嵌入å称"
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:250 builtin/log.c:459
+#: builtin/describe.c:250 builtin/log.c:465
#, c-format
msgid "Not a valid object name %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s"
@@ -5938,7 +6214,7 @@ msgstr "考虑最近 <n> 个标签(默认:10)"
msgid "only consider tags matching <pattern>"
msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> 的标签"
-#: builtin/describe.c:410 builtin/name-rev.c:314
+#: builtin/describe.c:410 builtin/name-rev.c:321
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡"
@@ -5972,21 +6248,21 @@ msgstr "'%s':ä¸æ˜¯ä¸€ä¸ªæ­£è§„文件或符å·é“¾æŽ¥"
msgid "invalid option: %s"
msgstr "无效选项:%s"
-#: builtin/diff.c:358
+#: builtin/diff.c:360
msgid "Not a git repository"
msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库"
-#: builtin/diff.c:401
+#: builtin/diff.c:403
#, c-format
msgid "invalid object '%s' given."
msgstr "æ供了无效对象 '%s'。"
-#: builtin/diff.c:410
+#: builtin/diff.c:412
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "æ供了超过两个数æ®å¯¹è±¡ï¼š'%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:419
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处ç†çš„对象 '%s'。"
@@ -6059,19 +6335,19 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:92 builtin/pull.c:166
+#: builtin/fetch.c:92 builtin/pull.c:174
msgid "fetch from all remotes"
msgstr "从所有的远程抓å–"
-#: builtin/fetch.c:94 builtin/pull.c:169
+#: builtin/fetch.c:94 builtin/pull.c:177
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它"
-#: builtin/fetch.c:96 builtin/pull.c:172
+#: builtin/fetch.c:96 builtin/pull.c:180
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:97 builtin/pull.c:174
+#: builtin/fetch.c:97 builtin/pull.c:182
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
@@ -6079,7 +6355,7 @@ msgstr "强制覆盖本地分支"
msgid "fetch from multiple remotes"
msgstr "从多个远程抓å–"
-#: builtin/fetch.c:101 builtin/pull.c:176
+#: builtin/fetch.c:101 builtin/pull.c:184
msgid "fetch all tags and associated objects"
msgstr "抓å–所有的标签和关è”对象"
@@ -6091,20 +6367,20 @@ msgstr "ä¸æŠ“å–任何标签(--no-tags)"
msgid "number of submodules fetched in parallel"
msgstr "å­æ¨¡ç»„获å–的并å‘æ•°"
-#: builtin/fetch.c:107 builtin/pull.c:179
+#: builtin/fetch.c:107 builtin/pull.c:187
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已ç»ä¸å­˜åœ¨çš„分支的跟踪分支"
# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘
-#: builtin/fetch.c:108 builtin/pull.c:182
+#: builtin/fetch.c:108 builtin/pull.c:190
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:109 builtin/pull.c:183
+#: builtin/fetch.c:109 builtin/pull.c:191
msgid "control recursive fetching of submodules"
msgstr "控制å­æ¨¡ç»„的递归抓å–"
-#: builtin/fetch.c:113 builtin/pull.c:191
+#: builtin/fetch.c:113 builtin/pull.c:199
msgid "keep downloaded pack"
msgstr "ä¿æŒä¸‹è½½åŒ…"
@@ -6112,15 +6388,15 @@ msgstr "ä¿æŒä¸‹è½½åŒ…"
msgid "allow updating of HEAD ref"
msgstr "å…许更新 HEAD 引用"
-#: builtin/fetch.c:118 builtin/pull.c:194
+#: builtin/fetch.c:118 builtin/pull.c:202
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历å²"
-#: builtin/fetch.c:120 builtin/pull.c:197
+#: builtin/fetch.c:120 builtin/pull.c:205
msgid "convert to a complete repository"
msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库"
-#: builtin/fetch.c:122 builtin/log.c:1236
+#: builtin/fetch.c:122 builtin/log.c:1399
msgid "dir"
msgstr "目录"
@@ -6132,15 +6408,15 @@ msgstr "在å­æ¨¡ç»„路径输出的å‰é¢åŠ ä¸Šæ­¤ç›®å½•"
msgid "default mode for recursion"
msgstr "递归的默认模å¼"
-#: builtin/fetch.c:128 builtin/pull.c:200
+#: builtin/fetch.c:128 builtin/pull.c:208
msgid "accept refs that update .git/shallow"
msgstr "接å—æ›´æ–° .git/shallow 的引用"
-#: builtin/fetch.c:129 builtin/pull.c:202
+#: builtin/fetch.c:129 builtin/pull.c:210
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:130 builtin/pull.c:203
+#: builtin/fetch.c:130 builtin/pull.c:211
msgid "specify fetch refmap"
msgstr "指定获å–æ“作的引用映射"
@@ -6199,11 +6475,6 @@ msgstr "强制更新"
msgid "(non-fast-forward)"
msgstr "(éžå¿«è¿›å¼ï¼‰"
-#: builtin/fetch.c:610 builtin/fetch.c:851
-#, c-format
-msgid "cannot open %s: %s\n"
-msgstr "无法打开 %s:%s\n"
-
#: builtin/fetch.c:619
#, c-format
msgid "%s did not send all necessary objects\n"
@@ -6402,55 +6673,55 @@ msgstr "检查连接中"
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:553
+#: builtin/fsck.c:552
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:559
+#: builtin/fsck.c:558
msgid "show unreachable objects"
msgstr "显示ä¸å¯è¾¾çš„对象"
-#: builtin/fsck.c:560
+#: builtin/fsck.c:559
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:561
+#: builtin/fsck.c:560
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:562
+#: builtin/fsck.c:561
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:563
+#: builtin/fsck.c:562
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:564
+#: builtin/fsck.c:563
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点(默认)"
-#: builtin/fsck.c:565
+#: builtin/fsck.c:564
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:566
+#: builtin/fsck.c:565
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:567
+#: builtin/fsck.c:566
msgid "enable more strict checking"
msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查"
-#: builtin/fsck.c:569
+#: builtin/fsck.c:568
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:570 builtin/prune.c:107
+#: builtin/fsck.c:569 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:631
+#: builtin/fsck.c:630
msgid "Checking objects"
msgstr "检查对象中"
@@ -6549,215 +6820,215 @@ msgstr "无法读å–树(%s)"
msgid "unable to grep from object of type %s"
msgstr "无法抓å–æ¥è‡ªäºŽ %s 类型的对象"
-#: builtin/grep.c:558
+#: builtin/grep.c:560
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:575
+#: builtin/grep.c:577
#, c-format
msgid "cannot open '%s'"
msgstr "ä¸èƒ½æ‰“å¼€ '%s'"
-#: builtin/grep.c:644
+#: builtin/grep.c:646
msgid "search in index instead of in the work tree"
msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
msgid "find in contents not managed by git"
msgstr "在未被 git 管ç†çš„内容中查找"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/grep.c:648
+#: builtin/grep.c:650
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中æœç´¢"
-#: builtin/grep.c:650
+#: builtin/grep.c:652
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包å«çš„文件"
-#: builtin/grep.c:653
+#: builtin/grep.c:655
msgid "show non-matching lines"
msgstr "显示未匹é…çš„è¡Œ"
-#: builtin/grep.c:655
+#: builtin/grep.c:657
msgid "case insensitive matching"
msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…"
-#: builtin/grep.c:657
+#: builtin/grep.c:659
msgid "match patterns only at word boundaries"
msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼"
-#: builtin/grep.c:659
+#: builtin/grep.c:661
msgid "process binary files as text"
msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†"
-#: builtin/grep.c:661
+#: builtin/grep.c:663
msgid "don't match patterns in binary files"
msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸­åŒ¹é…模å¼"
-#: builtin/grep.c:664
+#: builtin/grep.c:666
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处ç†äºŒè¿›åˆ¶æ–‡ä»¶"
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度å‘下寻找"
-#: builtin/grep.c:670
+#: builtin/grep.c:672
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达å¼"
-#: builtin/grep.c:673
+#: builtin/grep.c:675
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达å¼ï¼ˆé»˜è®¤ï¼‰"
-#: builtin/grep.c:676
+#: builtin/grep.c:678
msgid "interpret patterns as fixed strings"
msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„字符串"
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达å¼"
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show line numbers"
msgstr "显示行å·"
-#: builtin/grep.c:683
+#: builtin/grep.c:685
msgid "don't show filenames"
msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å"
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show filenames"
msgstr "显示文件å"
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件å"
-#: builtin/grep.c:688
+#: builtin/grep.c:690
msgid "show only filenames instead of matching lines"
msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ"
-#: builtin/grep.c:690
+#: builtin/grep.c:692
msgid "synonym for --files-with-matches"
msgstr "å’Œ --files-with-matches åŒä¹‰"
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show only the names of files without match"
msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å"
-#: builtin/grep.c:695
+#: builtin/grep.c:697
msgid "print NUL after filenames"
msgstr "在文件ååŽè¾“出 NUL 字符"
-#: builtin/grep.c:697
+#: builtin/grep.c:699
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹é…行数,而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ"
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "highlight matches"
msgstr "高亮显示匹é…项"
-#: builtin/grep.c:700
+#: builtin/grep.c:702
msgid "print empty line between matches from different files"
msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ"
-#: builtin/grep.c:702
+#: builtin/grep.c:704
msgid "show filename only once above matches from same file"
msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å"
-#: builtin/grep.c:705
+#: builtin/grep.c:707
msgid "show <n> context lines before and after matches"
msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文"
-#: builtin/grep.c:708
+#: builtin/grep.c:710
msgid "show <n> context lines before matches"
msgstr "显示匹é…é¡¹å‰ <n> 行上下文"
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show <n> context lines after matches"
msgstr "显示匹é…é¡¹åŽ <n> 行上下文"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:713
+#: builtin/grep.c:715
msgid "shortcut for -C NUM"
msgstr "å¿«æ·é”® -C æ•°å­—"
-#: builtin/grep.c:716
+#: builtin/grep.c:718
msgid "show a line with the function name before matches"
msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å"
-#: builtin/grep.c:718
+#: builtin/grep.c:720
msgid "show the surrounding function"
msgstr "显示所在函数的å‰åŽå†…容"
-#: builtin/grep.c:721
+#: builtin/grep.c:723
msgid "read patterns from file"
msgstr "从文件读å–模å¼"
-#: builtin/grep.c:723
+#: builtin/grep.c:725
msgid "match <pattern>"
msgstr "åŒ¹é… <模å¼>"
-#: builtin/grep.c:725
+#: builtin/grep.c:727
msgid "combine patterns specified with -e"
msgstr "组åˆç”¨ -e å‚数设定的模å¼"
-#: builtin/grep.c:737
+#: builtin/grep.c:739
msgid "indicate hit with exit status without output"
msgstr "ä¸è¾“出,而用退出ç æ ‡è¯†å‘½ä¸­çŠ¶æ€"
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show only matches from files that match all patterns"
msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件中的匹é…"
-#: builtin/grep.c:741
+#: builtin/grep.c:743
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达å¼çš„解æžæ ‘"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:745
+#: builtin/grep.c:747
msgid "show matching files in the pager"
msgstr "分页显示匹é…的文件"
-#: builtin/grep.c:748
+#: builtin/grep.c:750
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "å…许调用 grep(1)(本次构建忽略)"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "no pattern given."
msgstr "未æ供模å¼åŒ¹é…。"
-#: builtin/grep.c:843 builtin/index-pack.c:1475
+#: builtin/grep.c:845 builtin/index-pack.c:1477
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效(%d)"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:899
+#: builtin/grep.c:901
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/grep.c:904
+#: builtin/grep.c:906
msgid "--no-index or --untracked cannot be used with revs."
msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/grep.c:907
+#: builtin/grep.c:909
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。"
-#: builtin/grep.c:915
+#: builtin/grep.c:917
msgid "both --cached and trees are given."
msgstr "åŒæ—¶ç»™å‡ºäº† --cached 和树对象。"
@@ -6846,8 +7117,8 @@ msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22)。"
#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
#, c-format
-msgid "failed to exec '%s': %s"
-msgstr "无法执行 '%s':%s"
+msgid "failed to exec '%s'"
+msgstr "无法执行 '%s'"
#: builtin/help.c:205
#, c-format
@@ -7105,107 +7376,109 @@ msgstr "ä¸å¯ç†å–»"
#: builtin/index-pack.c:1253
#, c-format
-msgid "completed with %d local objects"
-msgstr "å®Œæˆ %d 个本地对象"
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "å®Œæˆ %d 个本地对象"
+msgstr[1] "å®Œæˆ %d 个本地对象"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1265
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现æ„外(ç£ç›˜æŸå?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1269
#, 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:1291
+#: builtin/index-pack.c:1293
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "ä¸èƒ½åŽ‹ç¼©é™„加对象(%d)"
-#: builtin/index-pack.c:1367
+#: builtin/index-pack.c:1369
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s å·²æŸå"
-#: builtin/index-pack.c:1391
+#: builtin/index-pack.c:1393
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1404
+#: builtin/index-pack.c:1406
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写ä¿ç•™æ–‡ä»¶ '%s'"
-#: builtin/index-pack.c:1412
+#: builtin/index-pack.c:1414
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭ä¿ç•™æ–‡ä»¶ '%s'"
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1427
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1436
+#: builtin/index-pack.c:1438
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1471
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "åçš„ pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
+#: builtin/index-pack.c:1481 builtin/index-pack.c:1678
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s"
-#: builtin/index-pack.c:1538
+#: builtin/index-pack.c:1540
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1540
+#: builtin/index-pack.c:1542
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1587
+#: builtin/index-pack.c:1589
#, 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:1594
+#: builtin/index-pack.c:1596
#, 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:1624
+#: builtin/index-pack.c:1609
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "包文件å '%s' 没有以 '.pack' 结尾"
+
+#: builtin/index-pack.c:1638
msgid "Cannot come back to cwd"
msgstr "无法返回当å‰å·¥ä½œç›®å½•"
-#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
-#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1693
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1709
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1709
+#: builtin/index-pack.c:1723
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨"
-#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件å '%s' 没有以 '.pack' 结尾"
-
-#: builtin/index-pack.c:1730
+#: builtin/index-pack.c:1731
msgid "--verify with no packfile name given"
msgstr "--verify 没有æ供包文件åå‚æ•°"
@@ -7244,27 +7517,27 @@ msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'"
msgid "ignoring template %s"
msgstr "忽略模版 %s"
-#: builtin/init-db.c:118
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "模版未找到 %s"
-#: builtin/init-db.c:131
+#: builtin/init-db.c:135
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
-msgstr "没有从 '%2$s' å¤åˆ¶å¸¦æœ‰é”™è¯¯ç‰ˆæœ¬ %1$d 的模版"
+msgid "not copying templates from '%s': %s"
+msgstr "没有从 '%s' å¤åˆ¶æ¨¡ç‰ˆï¼š%s"
-#: builtin/init-db.c:309 builtin/init-db.c:312
+#: builtin/init-db.c:312 builtin/init-db.c:315
#, c-format
msgid "%s already exists"
msgstr "%s å·²ç»å­˜åœ¨"
-#: builtin/init-db.c:340
+#: builtin/init-db.c:344
#, c-format
msgid "unable to handle file type %d"
msgstr "ä¸èƒ½å¤„ç† %d 类型的文件"
-#: builtin/init-db.c:343
+#: builtin/init-db.c:347
#, c-format
msgid "unable to move %s to %s"
msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s"
@@ -7272,25 +7545,25 @@ msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:399
+#: builtin/init-db.c:403
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git 仓库于 %s%s\n"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Reinitialized existing"
msgstr "é‡æ–°åˆå§‹åŒ–现存的"
-#: builtin/init-db.c:400
+#: builtin/init-db.c:404
msgid "Initialized empty"
msgstr "åˆå§‹åŒ–空的"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/init-db.c:401
+#: builtin/init-db.c:405
msgid " shared"
msgstr "共享"
-#: builtin/init-db.c:448
+#: builtin/init-db.c:452
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -7298,32 +7571,32 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] "
"[<目录>]"
-#: builtin/init-db.c:471
+#: builtin/init-db.c:475
msgid "permissions"
msgstr "æƒé™"
-#: builtin/init-db.c:472
+#: builtin/init-db.c:476
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:506 builtin/init-db.c:511
+#: builtin/init-db.c:510 builtin/init-db.c:515
#, c-format
msgid "cannot mkdir %s"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s"
-#: builtin/init-db.c:515
+#: builtin/init-db.c:519
#, c-format
msgid "cannot chdir to %s"
msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s"
-#: builtin/init-db.c:536
+#: builtin/init-db.c:540
#, 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:564
+#: builtin/init-db.c:568
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'"
@@ -7369,273 +7642,319 @@ msgstr "git show [<选项>] <对象>..."
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项:%s"
-#: builtin/log.c:131
+#: builtin/log.c:137
msgid "suppress diff output"
msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出"
-#: builtin/log.c:132
+#: builtin/log.c:138
msgid "show source"
msgstr "显示æº"
-#: builtin/log.c:133
+#: builtin/log.c:139
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:134
+#: builtin/log.c:140
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:137
+#: builtin/log.c:143
msgid "Process line range n,m in file, counting from 1"
msgstr "处ç†æ–‡ä»¶ä¸­ç¬¬ n 到 m 之间的行,从 1 开始"
-#: builtin/log.c:233
+#: builtin/log.c:239
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出:%d %s\n"
-#: builtin/log.c:465
+#: builtin/log.c:471
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: æŸå的文件"
-#: builtin/log.c:479 builtin/log.c:572
+#: builtin/log.c:485 builtin/log.c:578
#, c-format
msgid "Could not read object %s"
msgstr "ä¸èƒ½è¯»å–对象 %s"
-#: builtin/log.c:596
+#: builtin/log.c:602
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型:%d"
-#: builtin/log.c:715
+#: builtin/log.c:722
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:801
+#: builtin/log.c:812
msgid "name of output directory is too long"
msgstr "输出目录å太长"
-#: builtin/log.c:816
+#: builtin/log.c:827
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补ä¸æ–‡ä»¶ %s"
-#: builtin/log.c:830
+#: builtin/log.c:841
msgid "Need exactly one range."
msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:840
+#: builtin/log.c:851
msgid "Not a range."
msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚"
-#: builtin/log.c:946
+#: builtin/log.c:957
msgid "Cover letter needs email format"
msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼"
-#: builtin/log.c:1025
+#: builtin/log.c:1036
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ä¸æ­£å¸¸çš„ in-reply-to:%s"
-#: builtin/log.c:1053
+#: builtin/log.c:1064
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1098
+#: builtin/log.c:1109
msgid "Two output directories?"
msgstr "两个输出目录?"
-#: builtin/log.c:1214
+#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871
+#, c-format
+msgid "Unknown commit %s"
+msgstr "未知æ交 %s"
+
+#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304
+#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424
+#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593
+#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。"
+
+#: builtin/log.c:1231
+msgid "Could not find exact merge base."
+msgstr "ä¸èƒ½æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿ã€‚"
+
+#: builtin/log.c:1235
+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=<base-commit-id> 手动指定一个基线æ交。"
+
+#: builtin/log.c:1255
+msgid "Failed to find exact merge base"
+msgstr "无法找到准确的åˆå¹¶åŸºçº¿"
+
+#: builtin/log.c:1266
+msgid "base commit should be the ancestor of revision list"
+msgstr "基线æ交应该是版本列表的祖先"
+
+#: builtin/log.c:1270
+msgid "base commit shouldn't be in revision list"
+msgstr "基线æ交ä¸åº”该出现在版本列表中"
+
+#: builtin/log.c:1319
+msgid "cannot get patch id"
+msgstr "æ— æ³•å¾—åˆ°è¡¥ä¸ id"
+
+#: builtin/log.c:1377
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸"
-#: builtin/log.c:1217
+#: builtin/log.c:1380
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸"
-#: builtin/log.c:1221
+#: builtin/log.c:1384
msgid "print patches to standard out"
msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出"
-#: builtin/log.c:1223
+#: builtin/log.c:1386
msgid "generate a cover letter"
msgstr "生æˆä¸€å°é™„ä¿¡"
-#: builtin/log.c:1225
+#: builtin/log.c:1388
msgid "use simple number sequence for output file names"
msgstr "使用简å•çš„æ•°å­—åºåˆ—作为输出文件å"
-#: builtin/log.c:1226
+#: builtin/log.c:1389
msgid "sfx"
msgstr "åŽç¼€"
-#: builtin/log.c:1227
+#: builtin/log.c:1390
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <åŽç¼€> 代替 '.patch'"
-#: builtin/log.c:1229
+#: builtin/log.c:1392
msgid "start numbering patches at <n> instead of 1"
msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1"
-#: builtin/log.c:1231
+#: builtin/log.c:1394
msgid "mark the series as Nth re-roll"
msgstr "标记补ä¸ç³»åˆ—是第几次é‡åˆ¶"
-#: builtin/log.c:1233
+#: builtin/log.c:1396
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]"
-#: builtin/log.c:1236
+#: builtin/log.c:1399
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1239
+#: builtin/log.c:1402
msgid "don't strip/add [PATCH]"
msgstr "ä¸åˆ é™¤/添加 [PATCH]"
-#: builtin/log.c:1242
+#: builtin/log.c:1405
msgid "don't output binary diffs"
msgstr "ä¸è¾“出二进制差异"
-#: builtin/log.c:1244
+#: builtin/log.c:1407
msgid "output all-zero hash in From header"
msgstr "在 From 头信æ¯ä¸­è¾“出全为零的哈希值"
-#: builtin/log.c:1246
+#: builtin/log.c:1409
msgid "don't include a patch matching a commit upstream"
msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交中的补ä¸"
-#: builtin/log.c:1248
+#: builtin/log.c:1411
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰"
-#: builtin/log.c:1250
+#: builtin/log.c:1413
msgid "Messaging"
msgstr "邮件å‘é€"
-#: builtin/log.c:1251
+#: builtin/log.c:1414
msgid "header"
msgstr "header"
-#: builtin/log.c:1252
+#: builtin/log.c:1415
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1253 builtin/log.c:1255
+#: builtin/log.c:1416 builtin/log.c:1418
msgid "email"
msgstr "邮件地å€"
-#: builtin/log.c:1253
+#: builtin/log.c:1416
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1255
+#: builtin/log.c:1418
msgid "add Cc: header"
msgstr "添加抄é€"
-#: builtin/log.c:1257
+#: builtin/log.c:1420
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1258
+#: builtin/log.c:1421
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "å°† From 地å€è®¾ç½®ä¸º <标识>(如若ä¸æ供,则用æ交者 ID åšä¸ºåœ°å€ï¼‰"
-#: builtin/log.c:1260
+#: builtin/log.c:1423
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1261
+#: builtin/log.c:1424
msgid "make first mail a reply to <message-id>"
msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <邮件标识> 的回å¤"
-#: builtin/log.c:1262 builtin/log.c:1265
+#: builtin/log.c:1425 builtin/log.c:1428
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1263
+#: builtin/log.c:1426
msgid "attach the patch"
msgstr "附件方å¼æ·»åŠ è¡¥ä¸"
-#: builtin/log.c:1266
+#: builtin/log.c:1429
msgid "inline the patch"
msgstr "内è”显示补ä¸"
-#: builtin/log.c:1270
+#: builtin/log.c:1433
msgid "enable message threading, styles: shallow, deep"
msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深"
-#: builtin/log.c:1272
+#: builtin/log.c:1435
msgid "signature"
msgstr "ç­¾å"
-#: builtin/log.c:1273
+#: builtin/log.c:1436
msgid "add a signature"
msgstr "添加一个签å"
-#: builtin/log.c:1275
+#: builtin/log.c:1437
+msgid "base-commit"
+msgstr "基线æ交"
+
+#: builtin/log.c:1438
+msgid "add prerequisite tree info to the patch series"
+msgstr "为补ä¸åˆ—表添加å‰ç½®æ ‘ä¿¡æ¯"
+
+#: builtin/log.c:1440
msgid "add a signature from a file"
msgstr "从文件添加一个签å"
-#: builtin/log.c:1276
+#: builtin/log.c:1441
msgid "don't print the patch filenames"
msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å"
-#: builtin/log.c:1365
+#: builtin/log.c:1531
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1367
+#: builtin/log.c:1533
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix 和 -k 互斥。"
-#: builtin/log.c:1375
+#: builtin/log.c:1541
msgid "--name-only does not make sense"
msgstr "--name-only æ— æ„义"
-#: builtin/log.c:1377
+#: builtin/log.c:1543
msgid "--name-status does not make sense"
msgstr "--name-status æ— æ„义"
-#: builtin/log.c:1379
+#: builtin/log.c:1545
msgid "--check does not make sense"
msgstr "--check æ— æ„义"
-#: builtin/log.c:1407
+#: builtin/log.c:1573
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
-#: builtin/log.c:1409
+#: builtin/log.c:1575
#, c-format
msgid "Could not create directory '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/log.c:1506
+#: builtin/log.c:1672
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读å–ç­¾å文件 '%s'"
-#: builtin/log.c:1569
+#: builtin/log.c:1743
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1617
+#: builtin/log.c:1792
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]"
-#: builtin/log.c:1671
+#: builtin/log.c:1846
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <上游>。\n"
-#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
-#, c-format
-msgid "Unknown commit %s"
-msgstr "未知æ交 %s"
-
#: builtin/ls-files.c:378
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
@@ -7826,171 +8145,175 @@ msgstr "git merge [<选项>] <说明> HEAD <æ交>"
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:100
+#: builtin/merge.c:101
msgid "switch `m' requires a value"
msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼"
-#: builtin/merge.c:137
+#: builtin/merge.c:138
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç­–ç•¥ '%s'。\n"
-#: builtin/merge.c:138
+#: builtin/merge.c:139
#, c-format
msgid "Available strategies are:"
msgstr "å¯ç”¨çš„策略有:"
-#: builtin/merge.c:143
+#: builtin/merge.c:144
#, c-format
msgid "Available custom strategies are:"
msgstr "å¯ç”¨çš„自定义策略有:"
-#: builtin/merge.c:193 builtin/pull.c:123
+#: builtin/merge.c:194 builtin/pull.c:126
msgid "do not show a diffstat at the end of the merge"
msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计"
-#: builtin/merge.c:196 builtin/pull.c:126
+#: builtin/merge.c:197 builtin/pull.c:129
msgid "show a diffstat at the end of the merge"
msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计"
-#: builtin/merge.c:197 builtin/pull.c:129
+#: builtin/merge.c:198 builtin/pull.c:132
msgid "(synonym to --stat)"
msgstr "(和 --stat åŒä¹‰ï¼‰"
-#: builtin/merge.c:199 builtin/pull.c:132
+#: builtin/merge.c:200 builtin/pull.c:135
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在åˆå¹¶æ交信æ¯ä¸­æ·»åŠ ï¼ˆæœ€å¤š <n> æ¡ï¼‰ç²¾ç®€æ交记录"
-#: builtin/merge.c:202 builtin/pull.c:135
+#: builtin/merge.c:203 builtin/pull.c:138
msgid "create a single commit instead of doing a merge"
msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶"
-#: builtin/merge.c:204 builtin/pull.c:138
+#: builtin/merge.c:205 builtin/pull.c:141
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交(默认)"
-#: builtin/merge.c:206 builtin/pull.c:141
+#: builtin/merge.c:207 builtin/pull.c:144
msgid "edit message before committing"
msgstr "在æ交å‰ç¼–辑æ交说明"
-#: builtin/merge.c:207
+#: builtin/merge.c:208
msgid "allow fast-forward (default)"
msgstr "å…许快进(默认)"
-#: builtin/merge.c:209 builtin/pull.c:147
+#: builtin/merge.c:210 builtin/pull.c:150
msgid "abort if fast-forward is not possible"
msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶"
-#: builtin/merge.c:213
+#: builtin/merge.c:214
msgid "Verify that the named commit has a valid GPG signature"
msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç­¾å"
-#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
+#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157
#: builtin/revert.c:89
msgid "strategy"
msgstr "ç­–ç•¥"
-#: builtin/merge.c:215 builtin/pull.c:153
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "merge strategy to use"
msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç­–ç•¥"
-#: builtin/merge.c:216 builtin/pull.c:156
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:217 builtin/pull.c:157
+#: builtin/merge.c:218 builtin/pull.c:162
msgid "option for selected merge strategy"
msgstr "所选的åˆå¹¶ç­–略的选项"
-#: builtin/merge.c:219
+#: builtin/merge.c:220
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "åˆå¹¶çš„æ交说明(针对éžå¿«è¿›å¼åˆå¹¶ï¼‰"
-#: builtin/merge.c:223
+#: builtin/merge.c:224
msgid "abort the current in-progress merge"
msgstr "放弃当å‰æ­£åœ¨è¿›è¡Œçš„åˆå¹¶"
-#: builtin/merge.c:251
+#: builtin/merge.c:226 builtin/pull.c:169
+msgid "allow merging unrelated histories"
+msgstr "å…许åˆå¹¶ä¸ç›¸å…³çš„历å²"
+
+#: builtin/merge.c:254
msgid "could not run stash."
msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å­˜ã€‚"
-#: builtin/merge.c:256
+#: builtin/merge.c:259
msgid "stash failed"
msgstr "进度ä¿å­˜å¤±è´¥"
-#: builtin/merge.c:261
+#: builtin/merge.c:264
#, c-format
msgid "not a valid object: %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s"
-#: builtin/merge.c:280 builtin/merge.c:297
+#: builtin/merge.c:283 builtin/merge.c:300
msgid "read-tree failed"
msgstr "读å–树失败"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/merge.c:327
+#: builtin/merge.c:330
msgid " (nothing to squash)"
msgstr " (无å¯åŽ‹ç¼©ï¼‰"
-#: builtin/merge.c:340
+#: builtin/merge.c:343
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩æ交 -- 未更新 HEAD\n"
-#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
-#: builtin/merge.c:989
+#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987
+#: builtin/merge.c:1000
#, c-format
msgid "Could not write to '%s'"
msgstr "ä¸èƒ½å†™å…¥ '%s'"
-#: builtin/merge.c:372
+#: builtin/merge.c:375
msgid "Writing SQUASH_MSG"
msgstr "写入 SQUASH_MSG"
-#: builtin/merge.c:374
+#: builtin/merge.c:377
msgid "Finishing SQUASH_MSG"
msgstr "å®Œæˆ SQUASH_MSG"
-#: builtin/merge.c:397
+#: builtin/merge.c:400
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指å‘一个æ交"
-#: builtin/merge.c:538
+#: builtin/merge.c:541
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "åçš„ branch.%s.mergeoptions 字符串:%s"
-#: builtin/merge.c:657
+#: builtin/merge.c:660
msgid "Not handling anything other than two heads merge."
msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。"
-#: builtin/merge.c:671
+#: builtin/merge.c:674
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项:-X%s"
-#: builtin/merge.c:684
+#: builtin/merge.c:687
#, c-format
msgid "unable to write %s"
msgstr "ä¸èƒ½å†™ %s"
-#: builtin/merge.c:773
+#: builtin/merge.c:776
#, c-format
msgid "Could not read from '%s'"
msgstr "ä¸èƒ½ä»Ž '%s' 读å–"
-#: builtin/merge.c:782
+#: builtin/merge.c:785
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ­¤æ¬¡åˆå¹¶ã€‚\n"
-#: builtin/merge.c:788
+#: builtin/merge.c:791
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -8004,52 +8327,52 @@ msgstr ""
"\n"
"以 '%c' 开头的行将被忽略,而且空æ交说明将会终止æ交。\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:815
msgid "Empty commit message."
msgstr "空æ交信æ¯ã€‚"
-#: builtin/merge.c:824
+#: builtin/merge.c:835
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:879
+#: builtin/merge.c:890
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ­£å†²çªç„¶åŽæ交修正的结果。\n"
-#: builtin/merge.c:895
+#: builtin/merge.c:906
#, c-format
msgid "'%s' is not a commit"
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交"
-#: builtin/merge.c:936
+#: builtin/merge.c:947
msgid "No current branch."
msgstr "没有当å‰åˆ†æ”¯ã€‚"
-#: builtin/merge.c:938
+#: builtin/merge.c:949
msgid "No remote for the current branch."
msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程仓库。"
-#: builtin/merge.c:940
+#: builtin/merge.c:951
msgid "No default upstream defined for the current branch."
msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。"
-#: builtin/merge.c:945
+#: builtin/merge.c:956
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1091
#, c-format
msgid "could not close '%s'"
msgstr "ä¸èƒ½å…³é—­ '%s'"
-#: builtin/merge.c:1207
+#: builtin/merge.c:1219
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有è¦ç»ˆæ­¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。"
-#: builtin/merge.c:1223
+#: builtin/merge.c:1235
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8057,7 +8380,7 @@ msgstr ""
"您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå­˜åœ¨ MERGE_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1230
+#: builtin/merge.c:1242
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -8065,100 +8388,104 @@ msgstr ""
"您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。\n"
"请在åˆå¹¶å‰å…ˆæ交您的修改。"
-#: builtin/merge.c:1233
+#: builtin/merge.c:1245
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结æŸæ‚¨çš„拣选(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1242
+#: builtin/merge.c:1254
msgid "You cannot combine --squash with --no-ff."
msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚"
-#: builtin/merge.c:1250
+#: builtin/merge.c:1262
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1267
+#: builtin/merge.c:1279
msgid "Squash commit into empty head not supported yet"
msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交"
-#: builtin/merge.c:1269
+#: builtin/merge.c:1281
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义"
-#: builtin/merge.c:1275
+#: builtin/merge.c:1286
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - ä¸èƒ½è¢«åˆå¹¶"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1288
msgid "Can merge only exactly one commit into empty head"
msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1344
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1335
+#: builtin/merge.c:1347
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç­¾å。"
-#: builtin/merge.c:1338
+#: builtin/merge.c:1350
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "æ交 %s 没有一个 GPG ç­¾å。"
-#: builtin/merge.c:1341
+#: builtin/merge.c:1353
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç­¾å。\n"
-#: builtin/merge.c:1424
+#: builtin/merge.c:1415
+msgid "refusing to merge unrelated histories"
+msgstr "æ‹’ç»åˆå¹¶æ— å…³çš„历å²"
+
+#: builtin/merge.c:1439
#, c-format
msgid "Updating %s..%s\n"
msgstr "æ›´æ–° %s..%s\n"
-#: builtin/merge.c:1461
+#: builtin/merge.c:1476
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n"
-#: builtin/merge.c:1468
+#: builtin/merge.c:1483
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1515
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1538 builtin/merge.c:1617
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状æ€...\n"
-#: builtin/merge.c:1527
+#: builtin/merge.c:1542
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "å°è¯•åˆå¹¶ç­–ç•¥ %s...\n"
-#: builtin/merge.c:1593
+#: builtin/merge.c:1608
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有åˆå¹¶ç­–略处ç†æ­¤åˆå¹¶ã€‚\n"
-#: builtin/merge.c:1595
+#: builtin/merge.c:1610
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s åˆå¹¶å¤±è´¥ã€‚\n"
-#: builtin/merge.c:1604
+#: builtin/merge.c:1619
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1631
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ­¢\n"
@@ -8268,7 +8595,7 @@ msgstr "git mv [<选项>] <æº>... <目标>"
msgid "Directory %s is in index and no submodule?"
msgstr "目录 %s 在索引中并且ä¸æ˜¯å­æ¨¡ç»„?"
-#: builtin/mv.c:72
+#: builtin/mv.c:72 builtin/rm.c:317
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或ä¿å­˜è¿›åº¦åŽå†ç»§ç»­"
@@ -8346,48 +8673,48 @@ msgstr "%s,æº=%s,目标=%s"
msgid "Renaming %s to %s\n"
msgstr "é‡å‘½å %s 至 %s\n"
-#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
+#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365
#, c-format
msgid "renaming '%s' failed"
msgstr "é‡å‘½å '%s' 失败"
-#: builtin/name-rev.c:251
+#: builtin/name-rev.c:258
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <æ交>..."
-#: builtin/name-rev.c:252
+#: builtin/name-rev.c:259
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:253
+#: builtin/name-rev.c:260
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:305
+#: builtin/name-rev.c:312
msgid "print only names (no SHA-1)"
msgstr "åªæ‰“å°å称(无 SHA-1)"
-#: builtin/name-rev.c:306
+#: builtin/name-rev.c:313
msgid "only use tags to name the commits"
msgstr "åªä½¿ç”¨æ ‡ç­¾æ¥å‘½åæ交"
-#: builtin/name-rev.c:308
+#: builtin/name-rev.c:315
msgid "only use refs matching <pattern>"
msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用"
-#: builtin/name-rev.c:310
+#: builtin/name-rev.c:317
msgid "list all commits reachable from all refs"
msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:318
msgid "read from stdin"
msgstr "从标准输入读å–"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:319
msgid "allow to print `undefined` names (default)"
msgstr "å…è®¸æ‰“å° `未定义` çš„å称(默认)"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:325
msgid "dereference tags in the input (internal use)"
msgstr "åå‘解æžè¾“入中的标签(内部使用)"
@@ -8532,24 +8859,16 @@ msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡"
msgid "The note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:232 builtin/tag.c:440
+#: builtin/notes.c:232 builtin/tag.c:439
#, c-format
msgid "cannot read '%s'"
msgstr "ä¸èƒ½è¯»å– '%s'"
-#: builtin/notes.c:234 builtin/tag.c:443
+#: builtin/notes.c:234 builtin/tag.c:442
#, c-format
msgid "could not open or read '%s'"
msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'"
-#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
-#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
-#: builtin/notes.c:880 builtin/tag.c:456
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。"
-
#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
@@ -8562,7 +8881,7 @@ msgstr "ä¸èƒ½ä»Žéžæ•°æ®å¯¹è±¡ '%s' 中读å–注解数æ®"
#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
-#: builtin/notes.c:945
+#: builtin/notes.c:946
msgid "too many parameters"
msgstr "å‚数太多"
@@ -8607,7 +8926,7 @@ msgstr "ä¸èƒ½æ·»åŠ æ³¨è§£ã€‚å‘现对象 %s 已存在注解。使用 '-f' 覆ç›
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
+#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
@@ -8645,63 +8964,63 @@ msgstr ""
"å­å‘½ä»¤ 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请æ¢ç”¨ 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:767
+#: builtin/notes.c:768
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:769
+#: builtin/notes.c:770
msgid "Merge options"
msgstr "åˆå¹¶é€‰é¡¹"
-#: builtin/notes.c:771
+#: builtin/notes.c:772
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:773
+#: builtin/notes.c:774
msgid "Committing unmerged notes"
msgstr "æ交未åˆå¹¶çš„注解"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid "Aborting notes merge resolution"
msgstr "中止注解åˆå¹¶çš„方案"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "abort notes merge"
msgstr "中止注解åˆå¹¶"
-#: builtin/notes.c:856
+#: builtin/notes.c:857
#, c-format
msgid "A notes merge into %s is already in-progress at %s"
msgstr "一个到 %s 的注解åˆå¹¶å·²ç»åœ¨ %s 执行中"
-#: builtin/notes.c:883
+#: builtin/notes.c:884
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:895
+#: builtin/notes.c:896
msgid "attempt to remove non-existent note is not an error"
msgstr "å°è¯•åˆ é™¤ä¸å­˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯"
-#: builtin/notes.c:898
+#: builtin/notes.c:899
msgid "read object names from the standard input"
msgstr "从标准输入读å–对象å称"
-#: builtin/notes.c:979
+#: builtin/notes.c:980
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:980
+#: builtin/notes.c:981
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1015 builtin/remote.c:1626
+#: builtin/notes.c:1016 builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知å­å‘½ä»¤ï¼š%s"
@@ -8721,165 +9040,169 @@ msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:772
+#: builtin/pack-objects.c:763
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "ç¦ç”¨ bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
+
+#: builtin/pack-objects.c:776
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1017
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "ç¦ç”¨ bitmap 写入,因为一些对象将ä¸ä¼šè¢«æ‰“包"
-#: builtin/pack-objects.c:2172
+#: builtin/pack-objects.c:2177
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2558
+#: builtin/pack-objects.c:2563
#, c-format
msgid "unsupported index version %s"
msgstr "ä¸æ”¯æŒçš„索引版本 %s"
-#: builtin/pack-objects.c:2562
+#: builtin/pack-objects.c:2567
#, c-format
msgid "bad index version '%s'"
msgstr "å的索引版本 '%s'"
-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2597
msgid "do not show progress meter"
msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨"
-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2599
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2601
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2599
+#: builtin/pack-objects.c:2604
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2605
msgid "version[,offset]"
msgstr "版本[,å移]"
-#: builtin/pack-objects.c:2601
+#: builtin/pack-objects.c:2606
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件"
-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2609
msgid "maximum size of each output pack file"
msgstr "æ¯ä¸ªè¾“出包的最大尺寸"
-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2611
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2613
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2615
msgid "limit pack window by objects"
msgstr "é™åˆ¶æ‰“包窗å£çš„对象数"
-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2617
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内存é™åˆ¶"
-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2619
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包å…许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2621
msgid "reuse existing deltas"
msgstr "é‡ç”¨å·²å­˜åœ¨çš„ deltas"
-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2623
msgid "reuse existing objects"
msgstr "é‡ç”¨å·²å­˜åœ¨çš„对象"
-#: builtin/pack-objects.c:2620
+#: builtin/pack-objects.c:2625
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2627
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹é…"
-#: builtin/pack-objects.c:2624
+#: builtin/pack-objects.c:2629
msgid "do not create an empty pack output"
msgstr "ä¸åˆ›å»ºç©ºçš„包输出"
-#: builtin/pack-objects.c:2626
+#: builtin/pack-objects.c:2631
msgid "read revision arguments from standard input"
msgstr "从标准输入读å–版本å·å‚æ•°"
-#: builtin/pack-objects.c:2628
+#: builtin/pack-objects.c:2633
msgid "limit the objects to those that are not yet packed"
msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2636
msgid "include objects reachable from any reference"
msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象"
-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2639
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2642
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2645
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2647
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2644
+#: builtin/pack-objects.c:2649
msgid "keep unreachable objects"
msgstr "ç»´æŒä¸å¯è¾¾çš„对象"
-#: builtin/pack-objects.c:2645 parse-options.h:142
+#: builtin/pack-objects.c:2650 parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/pack-objects.c:2646
+#: builtin/pack-objects.c:2651
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2654
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2656
msgid "create packs suitable for shallow fetches"
msgstr "创建适åˆæµ…克隆仓库获å–的包"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2658
msgid "ignore packs that have companion .keep file"
msgstr "忽略é…有 .keep 文件的包"
-#: builtin/pack-objects.c:2655
+#: builtin/pack-objects.c:2660
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2662
msgid "do not hide commits by grafts"
msgstr "显示被å«æŽ¥éšè—çš„æ交"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2664
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的è¯ï¼‰ä»¥æ高对象计数时的速度"
-#: builtin/pack-objects.c:2661
+#: builtin/pack-objects.c:2666
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引"
-#: builtin/pack-objects.c:2752
+#: builtin/pack-objects.c:2757
msgid "Counting objects"
msgstr "对象计数中"
@@ -8907,15 +9230,15 @@ msgstr "正在删除é‡å¤å¯¹è±¡"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/prune.c:105 builtin/worktree.c:124
+#: builtin/prune.c:105 builtin/worktree.c:125
msgid "do not remove, show only"
msgstr "ä¸åˆ é™¤ï¼Œåªæ˜¾ç¤º"
-#: builtin/prune.c:106 builtin/worktree.c:125
+#: builtin/prune.c:106 builtin/worktree.c:126
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:109 builtin/worktree.c:127
+#: builtin/prune.c:109 builtin/worktree.c:128
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
@@ -8927,65 +9250,69 @@ msgstr "ä¸èƒ½åœ¨çå“仓库中执行清ç†æ“作"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:117
+#: builtin/pull.c:120
msgid "Options related to merging"
msgstr "å’Œåˆå¹¶ç›¸å…³çš„选项"
-#: builtin/pull.c:120
+#: builtin/pull.c:123
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用å˜åŸºæ“作å–代åˆå¹¶æ“作以åˆå…¥ä¿®æ”¹"
-#: builtin/pull.c:144 builtin/revert.c:105
+#: builtin/pull.c:147 builtin/revert.c:105
msgid "allow fast-forward"
msgstr "å…许快进å¼"
-#: builtin/pull.c:150
+#: builtin/pull.c:153
msgid "verify that the named commit has a valid GPG signature"
msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç­¾å"
-#: builtin/pull.c:164
+#: builtin/pull.c:156
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "自动在å˜åŸºæ“作å‰åŽæ‰§è¡Œ stash/stash pop"
+
+#: builtin/pull.c:172
msgid "Options related to fetching"
msgstr "和获å–相关的å‚æ•°"
-#: builtin/pull.c:186
+#: builtin/pull.c:194
msgid "number of submodules pulled in parallel"
msgstr "并å‘拉å–çš„å­æ¨¡ç»„çš„æ•°é‡"
-#: builtin/pull.c:275
+#: builtin/pull.c:283
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff çš„å–值无效:%s"
-#: builtin/pull.c:359
+#: builtin/pull.c:379
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "无法通过å˜åŸºæ–¹å¼æ‹‰å–:您有未暂存的å˜æ›´ã€‚"
-#: builtin/pull.c:365
+#: builtin/pull.c:385
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包å«æœªæ交的å˜æ›´ã€‚"
-#: builtin/pull.c:367
+#: builtin/pull.c:387
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "无法通过å˜åŸºæ–¹å¼æ‹‰å–:您的索引中包å«æœªæ交的å˜æ›´ã€‚"
-#: builtin/pull.c:443
+#: builtin/pull.c:463
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获å–到的引用中没有å˜åŸºæ“作的候选。"
-#: builtin/pull.c:445
+#: builtin/pull.c:465
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获å–到的引用中没有åˆå¹¶æ“作的候选。"
-#: builtin/pull.c:446
+#: builtin/pull.c:466
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这æ„味ç€æ‚¨æ供了一个通é…符引用规格但未能和远端匹é…。"
-#: builtin/pull.c:449
+#: builtin/pull.c:469
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -8995,38 +9322,42 @@ msgstr ""
"您è¦æ±‚从远程 '%s' 拉å–,但是未指定一个分支。因为这ä¸æ˜¯å½“å‰\n"
"分支默认的远程仓库,您必须在命令行中指定一个分支å。"
-#: builtin/pull.c:454
+#: builtin/pull.c:474 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当å‰ä¸åœ¨ä¸€ä¸ªåˆ†æ”¯ä¸Šã€‚"
-#: builtin/pull.c:456 builtin/pull.c:471
+#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您è¦å˜åŸºåˆ°å“ªä¸€ä¸ªåˆ†æ”¯ã€‚"
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您è¦åˆå¹¶å“ªä¸€ä¸ªåˆ†æ”¯ã€‚"
-#: builtin/pull.c:459 builtin/pull.c:474
+#: builtin/pull.c:479 builtin/pull.c:494
msgid "See git-pull(1) for details."
msgstr "è¯¦è§ git-pull(1)。"
-#: builtin/pull.c:469
+#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<远程>"
+
+#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<分支>"
+
+#: builtin/pull.c:489 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当å‰åˆ†æ”¯æ²¡æœ‰è·Ÿè¸ªä¿¡æ¯ã€‚"
-#: builtin/pull.c:478
-#, c-format
+#: builtin/pull.c:498 git-parse-remote.sh:95
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"
-msgstr ""
-"如果您想è¦ä¸ºæ­¤åˆ†æ”¯åˆ›å»ºè·Ÿè¸ªä¿¡æ¯ï¼Œæ‚¨å¯ä»¥æ‰§è¡Œï¼š\n"
-"\n"
-" git branch --set-upstream-to=%s/<branch> %s\n"
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "如果您想è¦ä¸ºæ­¤åˆ†æ”¯åˆ›å»ºè·Ÿè¸ªä¿¡æ¯ï¼Œæ‚¨å¯ä»¥æ‰§è¡Œï¼š"
-#: builtin/pull.c:483
+#: builtin/pull.c:503
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -9035,11 +9366,15 @@ msgstr ""
"您的é…置中指定è¦åˆå¹¶è¿œç¨‹çš„引用 '%s',\n"
"但是没有获å–到这个引用。"
-#: builtin/pull.c:841
+#: builtin/pull.c:864
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash 选项åªåœ¨ä½¿ç”¨ --rebase 时有效。"
+
+#: builtin/pull.c:872
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支,å˜æ›´æ·»åŠ è‡³ç´¢å¼•ã€‚"
-#: builtin/pull.c:870
+#: builtin/pull.c:900
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -9049,7 +9384,7 @@ msgstr ""
"fetch 更新了当å‰çš„分支。快进您的工作区\n"
"至æ交 %s。"
-#: builtin/pull.c:875
+#: builtin/pull.c:905
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -9066,11 +9401,11 @@ msgstr ""
"$ git reset --hard\n"
"æ¢å¤ä¹‹å‰çš„状æ€ã€‚"
-#: builtin/pull.c:890
+#: builtin/pull.c:920
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚"
-#: builtin/pull.c:894
+#: builtin/pull.c:924
msgid "Cannot rebase onto multiple branches."
msgstr "无法å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚"
@@ -9420,6 +9755,18 @@ msgstr "跳过应用稀ç–检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
+#: builtin/receive-pack.c:25
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:1719
+msgid "quiet"
+msgstr "é™é»˜æ¨¡å¼"
+
+#: builtin/receive-pack.c:1733
+msgid "You must specify a directory."
+msgstr "您必须指定一个目录。"
+
#: builtin/reflog.c:423
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
@@ -9738,27 +10085,29 @@ msgstr "* 远程 %s"
msgid " Fetch URL: %s"
msgstr " 获å–地å€ï¼š%s"
-#: builtin/remote.c:1148 builtin/remote.c:1299
+#: builtin/remote.c:1148 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(æ—  URL)"
-#: builtin/remote.c:1157 builtin/remote.c:1159
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1159 builtin/remote.c:1161
#, c-format
msgid " Push URL: %s"
msgstr " 推é€åœ°å€ï¼š%s"
-#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
+#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
-#: builtin/remote.c:1167
+#: builtin/remote.c:1169
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—中的一个):\n"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1181
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -9766,151 +10115,151 @@ msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,å¯åˆ é™¤å‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1182 builtin/remote.c:1209
+#: builtin/remote.c:1184 builtin/remote.c:1211
msgid " (status not queried)"
msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰"
-#: builtin/remote.c:1191
+#: builtin/remote.c:1193
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:1199
+#: builtin/remote.c:1201
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜åƒ"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1208
#, 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:1227
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<å称>/HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "ä¸èƒ½è®¾ç½® %s"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1284
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: builtin/remote.c:1285
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼"
-#: builtin/remote.c:1295
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1312
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1315
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1360
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "抓å–åŽæ¸…除远程"
-#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1439
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1446
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1463
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "æŸ¥è¯¢æŽ¨é€ URL 地å€ï¼Œè€ŒéžèŽ·å– URL 地å€"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "返回所有 URL 地å€"
-#: builtin/remote.c:1493
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "æ“ä½œæŽ¨é€ URLS"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete æ— æ„义"
-#: builtin/remote.c:1571
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹é…模版:%s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "å°†ä¸ä¼šåˆ é™¤æ‰€æœ‰éžæŽ¨é€ URL 地å€"
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于å­å‘½ä»¤ä¹‹å‰"
@@ -10410,10 +10759,6 @@ msgstr "å…许递归删除"
msgid "exit with a zero status even if nothing matched"
msgstr "å³ä½¿æ²¡æœ‰åŒ¹é…,也以零状æ€é€€å‡º"
-#: builtin/rm.c:317
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改缓存到 .gitmodules 中或ä¿å­˜è¿›åº¦åŽå†ç»§ç»­"
-
#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
@@ -10615,81 +10960,179 @@ msgstr "跳过和移除所有的注释行"
msgid "prepend comment character and space to each line"
msgstr "为æ¯ä¸€è¡Œçš„行首添加注释符和空格"
-#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
+#: builtin/submodule--helper.c:24
+#, c-format
+msgid "No such ref: %s"
+msgstr "没有这样的引用:%s"
+
+#: builtin/submodule--helper.c:31
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一个完整的引用å称,å´å¾—到 %s"
+
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "无法从 url '%s' 剥离一个组件"
+
+#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405
+#: builtin/submodule--helper.c:486
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记(anchor)"
-#: builtin/submodule--helper.c:78
+#: builtin/submodule--helper.c:283
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:108
+#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr "在 .gitmodules 中未找到å­æ¨¡ç»„ '%s' çš„ url"
+
+#: builtin/submodule--helper.c:366
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "无法为å­æ¨¡ç»„ '%s' 注册 url"
+
+#: builtin/submodule--helper.c:370
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "å­æ¨¡ç»„ '%s'(%s)未对路径 '%s' 注册\n"
+
+#
+#: builtin/submodule--helper.c:380
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "警告:建议å­æ¨¡ç»„ '%s' 使用命令更新模å¼\n"
+
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "无法为å­æ¨¡ç»„ '%s' 注册更新模å¼"
+
+#: builtin/submodule--helper.c:406
+msgid "Suppress output for initializing a submodule"
+msgstr "åˆå§‹åŒ–å­æ¨¡ç»„时抑制输出"
+
+#: builtin/submodule--helper.c:411
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<路径>]"
+
+#: builtin/submodule--helper.c:432
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:114
+#: builtin/submodule--helper.c:438
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有å‘现路径 '%s' çš„å­æ¨¡ç»„映射"
-#: builtin/submodule--helper.c:164
+#: builtin/submodule--helper.c:489
msgid "where the new submodule will be cloned to"
msgstr "æ–°çš„å­æ¨¡ç»„å°†è¦å…‹éš†çš„路径"
-#: builtin/submodule--helper.c:167
+#: builtin/submodule--helper.c:492
msgid "name of the new submodule"
msgstr "æ–°å­æ¨¡ç»„çš„å称"
-#: builtin/submodule--helper.c:170
+#: builtin/submodule--helper.c:495
msgid "url where to clone the submodule from"
msgstr "克隆å­æ¨¡ç»„çš„ url 地å€"
-#: builtin/submodule--helper.c:176
+#: builtin/submodule--helper.c:501
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:182
+#: builtin/submodule--helper.c:507
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr ""
-"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
-"[--name <åå­—>] [--url <地å€>][--depth <深度>] [--] [<路径>...]"
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--name <åå­—>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
-#: builtin/submodule--helper.c:210
+#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538
#, c-format
msgid "could not create directory '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/submodule--helper.c:198
+#: builtin/submodule--helper.c:534
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到å­æ¨¡ç»„路径 '%s'"
-#: builtin/submodule--helper.c:221
+#: builtin/submodule--helper.c:550
#, c-format
msgid "cannot open file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/submodule--helper.c:226
+#: builtin/submodule--helper.c:555
#, c-format
msgid "could not close file %s"
msgstr "无法关闭文件 %s"
-#: builtin/submodule--helper.c:241
+#: builtin/submodule--helper.c:562
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' çš„å­æ¨¡ç»„目录"
-#: builtin/submodule--helper.c:267
-msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "严é‡é”™è¯¯ï¼šsubmodule-helper å­å‘½ä»¤å¿…须由å¦å¤–çš„å­å‘½ä»¤è°ƒç”¨"
+#: builtin/submodule--helper.c:609
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "å­æ¨¡ç»„ '%s' 尚未åˆå§‹åŒ–"
-#: builtin/submodule--helper.c:274
+#: builtin/submodule--helper.c:613
+msgid "Maybe you want to use 'update --init'?"
+msgstr "也许您想è¦æ‰§è¡Œ 'update --init'?"
+
+#: builtin/submodule--helper.c:639
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "略过未åˆå¹¶çš„å­æ¨¡ç»„ %s"
+
+#: builtin/submodule--helper.c:660
#, c-format
-msgid "fatal: '%s' is not a valid submodule--helper subcommand"
-msgstr "严é‡é”™è¯¯ï¼š'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å­å‘½ä»¤"
+msgid "Skipping submodule '%s'"
+msgstr "略过å­æ¨¡ç»„ '%s'"
+
+#: builtin/submodule--helper.c:768
+msgid "path into the working tree"
+msgstr "到工作区的路径"
+
+#: builtin/submodule--helper.c:771
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "工作区中的路径,递归嵌套å­æ¨¡ç»„"
+
+#: builtin/submodule--helper.c:775
+msgid "rebase, merge, checkout or none"
+msgstr "rebaseã€mergeã€checkout 或 none"
+
+#: builtin/submodule--helper.c:779
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "创建一个指定深度的浅克隆"
+
+#: builtin/submodule--helper.c:782
+msgid "parallel jobs"
+msgstr "并å‘任务"
+
+#: builtin/submodule--helper.c:783
+msgid "don't print cloning progress"
+msgstr "ä¸è¦è¾“出克隆进度"
+
+#: builtin/submodule--helper.c:788
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
+
+#: builtin/submodule--helper.c:798
+msgid "bad value for update parameter"
+msgstr "update å‚æ•°å–值错误"
+
+#: builtin/submodule--helper.c:855
+msgid "submodule--helper subcommand must be called with a subcommand"
+msgstr "submodule-helper å­å‘½ä»¤å¿…须由å¦å¤–çš„å­å‘½ä»¤è°ƒç”¨"
+
+#: builtin/submodule--helper.c:862
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å­å‘½ä»¤"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -10742,27 +11185,22 @@ msgstr ""
msgid "git tag -v <tagname>..."
msgstr "git tag -v <标签å>..."
-#: builtin/tag.c:80
+#: builtin/tag.c:81
#, c-format
msgid "tag name too long: %.*s..."
msgstr "标签å称太长:%.*s..."
-#: builtin/tag.c:85
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "未å‘现标签 '%s'。"
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'(曾为 %s)\n"
-#: builtin/tag.c:112
-#, c-format
-msgid "could not verify the tag '%s'"
-msgstr "ä¸èƒ½æ ¡éªŒè¯¥æ ‡ç­¾ '%s'"
-
-#: builtin/tag.c:122
+#: builtin/tag.c:117
#, c-format
msgid ""
"\n"
@@ -10775,7 +11213,7 @@ msgstr ""
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:126
+#: builtin/tag.c:121
#, c-format
msgid ""
"\n"
@@ -10906,21 +11344,21 @@ msgstr "选项 --merged å’Œ --no-merged åªèƒ½å’Œ -l 共用"
msgid "only one -F or -m option is allowed."
msgstr "åªå…许一个 -F 或 -m 选项。"
-#: builtin/tag.c:453
+#: builtin/tag.c:452
msgid "too many params"
msgstr "太多å‚æ•°"
-#: builtin/tag.c:459
+#: builtin/tag.c:458
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„标签å称。"
-#: builtin/tag.c:464
+#: builtin/tag.c:463
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:489
+#: builtin/tag.c:491
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s)\n"
@@ -11168,7 +11606,7 @@ msgstr "git verify-commit [-v | --verbose] <æ交>..."
msgid "print commit contents"
msgstr "打å°æ交内容"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
msgid "print raw gpg status output"
msgstr "打å°åŽŸå§‹ gpg 状æ€è¾“出"
@@ -11188,7 +11626,7 @@ msgstr "åªæ˜¾ç¤ºç»Ÿè®¡"
msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr "git verify-tag [-v | --verbose] <标签>..."
-#: builtin/verify-tag.c:83
+#: builtin/verify-tag.c:34
msgid "print tag contents"
msgstr "打å°æ ‡ç­¾å†…容"
@@ -11204,68 +11642,72 @@ msgstr "git worktree prune [<选项>]"
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:39
+#: builtin/worktree.c:40
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s:ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录"
-#: builtin/worktree.c:45
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s:gitdir 文件ä¸å­˜åœ¨"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:51
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)"
-#: builtin/worktree.c:61
+#: builtin/worktree.c:62
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
-#: builtin/worktree.c:77
+#: builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s:gitdir 文件的指å‘ä¸å­˜åœ¨"
-#: builtin/worktree.c:112
+#: builtin/worktree.c:113
#, c-format
-msgid "failed to remove: %s"
-msgstr "无法删除:%s"
+msgid "failed to remove '%s'"
+msgstr "无法删除 '%s'"
-#: builtin/worktree.c:201
+#: builtin/worktree.c:202
#, c-format
msgid "'%s' already exists"
msgstr "'%s' å·²ç»å­˜åœ¨"
-#: builtin/worktree.c:233
+#: builtin/worktree.c:234
#, c-format
msgid "could not create directory of '%s'"
msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'"
-#: builtin/worktree.c:269
+#: builtin/worktree.c:270
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s (标识符 %s)"
-#: builtin/worktree.c:317
+#: builtin/worktree.c:322
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº"
-#: builtin/worktree.c:319
+#: builtin/worktree.c:324
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:321
+#: builtin/worktree.c:326
msgid "create or reset a branch"
msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯"
-#: builtin/worktree.c:322
+#: builtin/worktree.c:327
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的æ交分离"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:328
+msgid "populate the new working tree"
+msgstr "生æˆæ–°çš„工作区"
+
+#: builtin/worktree.c:336
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-bã€-B å’Œ --detach 是互斥的"
@@ -11285,7 +11727,7 @@ msgstr "å°† <å‰ç¼€> å­ç›®å½•å†…容写到一个树对象"
msgid "only useful for debugging"
msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨"
-#: credential-cache--daemon.c:262
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "调试信æ¯è¾“出到标准错误"
@@ -11299,7 +11741,7 @@ msgstr ""
"查看 'git help <命令>' 或 'git help <概念>' 以获å–给定å­å‘½ä»¤æˆ–概念的\n"
"帮助。"
-#: http.c:321
+#: http.c:322
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "ä¸æ”¯æŒå…¬é’¥æ–‡ä»¶é”定,因为 cURL < 7.44.0"
@@ -11427,7 +11869,7 @@ msgstr "更加安é™"
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> ä½æ•°å­—显示 SHA-1 哈希值"
-#: rerere.h:38
+#: rerere.h:40
msgid "update the index with reused conflict resolution if possible"
msgstr "如果å¯èƒ½ï¼Œé‡ç”¨å†²çªè§£å†³æ›´æ–°ç´¢å¼•"
@@ -11638,16 +12080,16 @@ msgstr ""
"如果您想跳过此补ä¸ï¼Œåˆ™æ‰§è¡Œ \"git rebase --skip\"。\n"
"è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ­¢å˜åŸºï¼Œæ‰§è¡Œ \"git rebase --abort\"。"
-#: git-rebase.sh:165
+#: git-rebase.sh:168
msgid "Applied autostash."
msgstr "æˆåŠŸåº”用 autostash。"
-#: git-rebase.sh:168
+#: git-rebase.sh:171
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法ä¿å­˜ $stash_sha1"
-#: git-rebase.sh:169
+#: git-rebase.sh:172
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
@@ -11657,31 +12099,27 @@ msgstr ""
"您的修改安全地ä¿å­˜åœ¨ stash 中。\n"
"您å¯ä»¥åœ¨ä»»ä½•æ—¶å€™è¿è¡Œ \"git stash pop\" 或 \"git stash drop\"。\n"
-#: git-rebase.sh:208
+#: git-rebase.sh:211
msgid "The pre-rebase hook refused to rebase."
msgstr "é’©å­ pre-rebase æ‹’ç»å˜åŸºæ“作。"
-#: git-rebase.sh:213
+#: git-rebase.sh:216
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法å˜åŸºã€‚"
-#: git-rebase.sh:354
-msgid "The --exec option must be used with the --interactive option"
-msgstr "选项 --exec 必须和选项 --interactive åŒæ—¶ä½¿ç”¨"
-
-#: git-rebase.sh:359
+#: git-rebase.sh:357
msgid "No rebase in progress?"
msgstr "没有正在进行的å˜åŸºï¼Ÿ"
-#: git-rebase.sh:370
+#: git-rebase.sh:368
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸­ã€‚"
-#: git-rebase.sh:377
+#: git-rebase.sh:375
msgid "Cannot read HEAD"
msgstr "ä¸èƒ½è¯»å– HEAD"
-#: git-rebase.sh:380
+#: git-rebase.sh:378
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -11689,12 +12127,12 @@ msgstr ""
"您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:398
+#: git-rebase.sh:396
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:417
+#: git-rebase.sh:415
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -11713,64 +12151,64 @@ msgstr ""
"\t$cmd_clear_stale_rebase\n"
"然åŽå†é‡æ–°æ‰§è¡Œå˜åŸºæ“作。 为é¿å…丢失é‡è¦æ•°æ®ï¼Œæˆ‘å·²ç»åœæ­¢å½“å‰æ“作。"
-#: git-rebase.sh:468
+#: git-rebase.sh:466
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:492
+#: git-rebase.sh:490
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:495 git-rebase.sh:499
+#: git-rebase.sh:493 git-rebase.sh:497
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†"
-#: git-rebase.sh:504
+#: git-rebase.sh:502
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指å‘一个有效的æ交:$onto_name"
-#: git-rebase.sh:527
+#: git-rebase.sh:525
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严é‡é”™è¯¯ï¼šæ— æ­¤åˆ†æ”¯ï¼š$branch_name"
-#: git-rebase.sh:560
+#: git-rebase.sh:558
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:565
+#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:569
+#: git-rebase.sh:567
msgid "Please commit or stash them."
msgstr "请æ交或为它们ä¿å­˜è¿›åº¦ã€‚"
-#: git-rebase.sh:589
+#: git-rebase.sh:587
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。"
-#: git-rebase.sh:593
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚"
-#: git-rebase.sh:604
+#: git-rebase.sh:602
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "å˜æ›´ä»Ž $mb 到 $onto:"
-#: git-rebase.sh:613
+#: git-rebase.sh:611
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先,回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..."
-#: git-rebase.sh:623
+#: git-rebase.sh:621
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
@@ -11914,26 +12352,21 @@ msgstr "未指定分支å"
msgid "(To restore them type \"git stash apply\")"
msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")"
-#: git-submodule.sh:104
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
-msgstr "无法从 url '$remoteurl' 剥离一个组件"
-
-#: git-submodule.sh:281
+#: git-submodule.sh:219
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "åªèƒ½åœ¨å·¥ä½œåŒºçš„顶级目录中使用相对路径"
-#: git-submodule.sh:291
+#: git-submodule.sh:229
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始"
-#: git-submodule.sh:308
+#: git-submodule.sh:246
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' å·²ç»å­˜åœ¨äºŽç´¢å¼•ä¸­"
-#: git-submodule.sh:312
+#: git-submodule.sh:250
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -11944,428 +12377,220 @@ msgstr ""
"$sm_path\n"
"如果您确实想添加它,使用 -f å‚数。"
-#: git-submodule.sh:330
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加ä½äºŽ '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:332
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库"
-#: git-submodule.sh:340
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
-#: git-submodule.sh:342
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from"
msgstr "如果您想é‡ç”¨æ­¤æœ¬åœ° git 目录而ä¸æ˜¯é‡æ–°å…‹éš†è‡ª"
-#: git-submodule.sh:344
+#: git-submodule.sh:282
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
msgstr "使用 '--force' å‚数。如果本地 git 目录ä¸æ˜¯æ­£ç¡®çš„仓库"
-#: git-submodule.sh:345
+#: git-submodule.sh:283
#, sh-format
msgid ""
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr "或者您ä¸ç¡®å®šå…¶ä¸­å«ä¹‰ä½¿ç”¨ '--name' å‚数选择å¦å¤–一个å称。"
-#: git-submodule.sh:347
+#: git-submodule.sh:285
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到å­æ¨¡ç»„ '$sm_name'。"
-#: git-submodule.sh:359
+#: git-submodule.sh:297
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "ä¸èƒ½æ£€å‡ºå­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:364
+#: git-submodule.sh:302
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:373
+#: git-submodule.sh:311
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册å­æ¨¡ç»„ '$sm_path'"
-#: git-submodule.sh:417
+#: git-submodule.sh:355
#, sh-format
-msgid "Entering '$prefix$displaypath'"
-msgstr "正在进入 '$prefix$displaypath'"
+msgid "Entering '$displaypath'"
+msgstr "正在进入 '$displaypath'"
-#: git-submodule.sh:437
+#: git-submodule.sh:375
#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
-msgstr "åœæ­¢äºŽ '$prefix$displaypath',脚本返回éžé›¶å€¼ã€‚"
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr "åœæ­¢äºŽ '$displaypath';脚本返回éžé›¶å€¼ã€‚"
-#: git-submodule.sh:483
+#: git-submodule.sh:448
#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
-msgstr "在 .gitmodules 中未找到å­æ¨¡ç»„路径 '$displaypath' çš„ url"
+msgid "pathspec and --all are incompatible"
+msgstr "pathspec å’Œ --all ä¸å…¼å®¹"
-#: git-submodule.sh:492
+#: git-submodule.sh:453
#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
-msgstr "无法为å­æ¨¡ç»„路径 '$displaypath' 注册 url"
-
-#: git-submodule.sh:494
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
-msgstr "å­æ¨¡ç»„ '$name' ($url) 未对路径 '$displaypath' 注册"
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您确实想è¦å¯¹æ‰€æœ‰å­æ¨¡ç»„执行å–消åˆå§‹åŒ–,请使用 '--all'"
-#: git-submodule.sh:511
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
-msgstr "无法为å­æ¨¡ç»„路径 '$displaypath' 注册更新模å¼"
-
-#: git-submodule.sh:549
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
-msgstr "使用 '.' 如果您真的想è¦å¯¹æ‰€æœ‰å­æ¨¡ç»„å–消åˆå§‹åŒ–"
-
-#: git-submodule.sh:566
+#: git-submodule.sh:470
#, sh-format
msgid "Submodule work tree '$displaypath' contains a .git directory"
msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录"
-#: git-submodule.sh:567
+#: git-submodule.sh:471
#, sh-format
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "(使用 'rm -rf' 命令如果您真的想删除它åŠå…¶å…¨éƒ¨åŽ†å²ï¼‰"
-#: git-submodule.sh:573
+#: git-submodule.sh:477
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
msgstr "å­æ¨¡ç»„工作区 '$displaypath' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们"
-#: git-submodule.sh:576
+#: git-submodule.sh:480
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "已清除目录 '$displaypath'"
-#: git-submodule.sh:577
+#: git-submodule.sh:481
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "无法移除å­æ¨¡ç»„工作区 '$displaypath'"
-#: git-submodule.sh:580
+#: git-submodule.sh:484
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å­æ¨¡ç»„目录 '$displaypath'"
-#: git-submodule.sh:589
+#: git-submodule.sh:493
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "å­æ¨¡ç»„ '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:723
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
-msgstr ""
-"å­æ¨¡ç»„路径 '$displaypath' 没有åˆå§‹åŒ–\n"
-"也许您想用 'update --init'?"
-
-#: git-submodule.sh:736
+#: git-submodule.sh:635
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中找到当å‰ç‰ˆæœ¬"
-#: git-submodule.sh:745
+#: git-submodule.sh:644
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在å­æ¨¡ç»„路径 '$sm_path' 中获å–"
-#: git-submodule.sh:768
+#: git-submodule.sh:667
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中获å–"
-#: git-submodule.sh:788
+#: git-submodule.sh:680
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:789
+#: git-submodule.sh:681
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':检出 '$sha1'"
-#: git-submodule.sh:793
+#: git-submodule.sh:685
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在å­æ¨¡ç»„路径 '$displaypath' 中å˜åŸº '$sha1'"
-#: git-submodule.sh:794
+#: git-submodule.sh:686
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':å˜åŸºè‡³ '$sha1'"
-#: git-submodule.sh:799
+#: git-submodule.sh:691
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法åˆå¹¶ '$sha1' 到å­æ¨¡ç»„路径 '$displaypath' 中"
-#: git-submodule.sh:800
+#: git-submodule.sh:692
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "å­æ¨¡ç»„路径 '$displaypath':已åˆå¹¶å…¥ '$sha1'"
-#: git-submodule.sh:805
+#: git-submodule.sh:697
#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
-msgstr "在å­æ¨¡ç»„路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "在å­æ¨¡ç»„ '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:806
+#: git-submodule.sh:698
#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
-msgstr "å­æ¨¡ç»„路径 '$prefix$sm_path': '$command $sha1'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "å­æ¨¡ç»„ '$displaypath':'$command $sha1'"
-#: git-submodule.sh:836
+#: git-submodule.sh:729
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$displaypath'"
-#: git-submodule.sh:944
+#: git-submodule.sh:837
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨"
-#: git-submodule.sh:996
+#: git-submodule.sh:889
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1016
+#: git-submodule.sh:909
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1019
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_dst"
# 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼
-#: git-submodule.sh:1022
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst"
-#: git-submodule.sh:1047
+#: git-submodule.sh:940
msgid "blob"
msgstr "æ•°æ®å¯¹è±¡"
-#: git-submodule.sh:1165
+#: git-submodule.sh:1059
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进å­æ¨¡ç»„路径 '$sm_path'"
-#: git-submodule.sh:1229
+#: git-submodule.sh:1123
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' åŒæ­¥å­æ¨¡ç»„ url"
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr "本地æ交转移至更新åŽçš„上游分支中"
-
-#~ msgid "unable to parse format"
-#~ msgstr "ä¸èƒ½è§£æžæ ¼å¼"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "输入了ä¸æ­£ç¡®çš„æ ¼å¼ align:%s"
-
-#~ msgid "Could not set core.worktree in %s"
-#~ msgstr "ä¸èƒ½åœ¨ %s 中设置 core.worktree"
-
-# 译者:字符串首行行首è¦æ·»åŠ â€œwarning: â€å­—串,故此首行è¦è¾ƒå…¶ä½™è¡ŒçŸ­
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
-#~ "å˜æ›´ä¸º 'simple'。若è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä¿æŒä¼ ç»Ÿä¹ æƒ¯ï¼Œè¿›è¡Œå¦‚下设置:\n"
-#~ "\n"
-#~ " git config --global push.default matching\n"
-#~ "\n"
-#~ "è‹¥è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä»ŽçŽ°åœ¨å¼€å§‹é‡‡ç”¨æ–°çš„使用习惯,设置:\n"
-#~ "\n"
-#~ " git config --global push.default simple\n"
-#~ "\n"
-#~ "当 push.default 设置为 'matching' åŽï¼Œgit 将推é€å’Œè¿œç¨‹åŒå的所有\n"
-#~ "本地分支。\n"
-#~ "\n"
-#~ "从 Git 2.0 开始,Git 默认采用更为ä¿å®ˆçš„ 'simple' 模å¼ï¼ŒåªæŽ¨é€å½“å‰\n"
-#~ "分支到远程关è”çš„åŒååˆ†æ”¯ï¼Œå³ 'git push' 推é€å½“å‰åˆ†æ”¯ã€‚\n"
-#~ "\n"
-#~ "å‚è§ 'git help config' 并查找 'push.default' 以获å–更多信æ¯ã€‚\n"
-#~ "('simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git,\n"
-#~ "为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple')"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "ä¸èƒ½è¿½åŠ  '%s'"
-
-#~ msgid "Could not set '%s'"
-#~ msgstr "ä¸èƒ½è®¾ç½® '%s'"
-
-# 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Missing author: %s"
-#~ msgstr "缺少作者:%s"
-
-#~ msgid "Testing "
-#~ msgstr "正在测试 "
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "无法在å£ä»¤æ–‡ä»¶ä¸­æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s"
-
-#~ msgid "no such user"
-#~ msgstr "无此用户"
-
-#~ msgid "show usage"
-#~ msgstr "显示用法"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "分支 '%s' 未指å‘一个æ交"
-
-#~ msgid "object '%s' does not point to a commit"
-#~ msgstr "对象 '%s' 没有指å‘一个æ交"
-
-#~ msgid "print only merged branches"
-#~ msgstr "åªæ‰“å°åˆå¹¶çš„分支"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "æ供了å‚æ•° --dissociate,但未æä¾› --reference"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "太长的模版å %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "太长的符å·é“¾æŽ¥ %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "太长的模版路径 %s"
-
-#~ msgid "insane git directory %s"
-#~ msgstr "ä¸æ­£å¸¸çš„ git 目录 %s"
-
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "ä¸æ”¯æŒçš„排åºè§„æ ¼ '%s'"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "ä¸æ”¯æŒå˜é‡ '%2$s' 的排åºè§„æ ¼ '%1$s'"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡"
-
-#~ msgid "sort tags"
-#~ msgstr "排åºæ ‡ç­¾"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort å’Œ -n ä¸å…¼å®¹"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr "Gitdir '$a' 在å­æ¨¡ç»„路径 '$b' 之下或相å"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "BUG: é‡æ–°æ‰“开一个ä»æ‰“å¼€ç€çš„é”文件"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "BUG: é‡æ–°æ‰“开一个已æ交的é”文件"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "选项 %s ä¸æŽ¥å—å¦å®šæ ¼å¼"
-
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "ä¸èƒ½è§£æžé€‰é¡¹ %1$s 的值 '%2$s'"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b 和 -B 互斥"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "您需è¦å…ˆè®¾ç½®ä½ çš„æ交者信æ¯"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "当您解决了此问题åŽï¼Œæ‰§è¡Œ \"$cmdline --continue\"。\n"
-#~ "如果您想跳过此补ä¸ï¼Œåˆ™æ‰§è¡Œ \"$cmdline --skip\"。\n"
-#~ "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ­¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。"
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "ä¸æ”¯æŒ $patch_format è¡¥ä¸æ ¼å¼ã€‚"
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "请下决心。--skip 或是 --abort ?"
-
-#~ msgid ""
-#~ "Patch is empty. Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ\n"
-#~ "如果您想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --skip\"。\n"
-#~ "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ­¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。"
-
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "è¡¥ä¸ä¸­æ²¡æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„邮件地å€ã€‚"
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "正应用:$FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "è¡¥ä¸å¤±è´¥äºŽ $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, 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 ""
-#~ "Pull ä¸å¯ç”¨ï¼Œå› ä¸ºæ‚¨å°šæœ‰æœªåˆå¹¶çš„文件。请先在工作区改正文件,\n"
-#~ "然åŽé…Œæƒ…使用 'git add/rm <文件>' 标记解决方案,å†åšæ交。"
-
-#~ msgid "Pull is not possible because you have unmerged files."
-#~ msgstr "Pull ä¸å¯ç”¨ï¼Œå› ä¸ºæ‚¨å°šæœ‰æœªåˆå¹¶çš„文件。"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "è¯¦è§ git-${cmd}(1)。"
diff --git a/pretty.c b/pretty.c
index 92b2870..87c4497 100644
--- a/pretty.c
+++ b/pretty.c
@@ -16,6 +16,7 @@ static struct cmt_fmt_map {
const char *name;
enum cmit_fmt format;
int is_tformat;
+ int expand_tabs_in_log;
int is_alias;
const char *user_format;
} *commit_formats;
@@ -87,13 +88,13 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c
static void setup_commit_formats(void)
{
struct cmt_fmt_map builtin_formats[] = {
- { "raw", CMIT_FMT_RAW, 0 },
- { "medium", CMIT_FMT_MEDIUM, 0 },
- { "short", CMIT_FMT_SHORT, 0 },
- { "email", CMIT_FMT_EMAIL, 0 },
- { "fuller", CMIT_FMT_FULLER, 0 },
- { "full", CMIT_FMT_FULL, 0 },
- { "oneline", CMIT_FMT_ONELINE, 1 }
+ { "raw", CMIT_FMT_RAW, 0, 0 },
+ { "medium", CMIT_FMT_MEDIUM, 0, 8 },
+ { "short", CMIT_FMT_SHORT, 0, 0 },
+ { "email", CMIT_FMT_EMAIL, 0, 0 },
+ { "fuller", CMIT_FMT_FULLER, 0, 8 },
+ { "full", CMIT_FMT_FULL, 0, 8 },
+ { "oneline", CMIT_FMT_ONELINE, 1, 0 }
};
commit_formats_len = ARRAY_SIZE(builtin_formats);
builtin_formats_len = commit_formats_len;
@@ -172,6 +173,7 @@ 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 (commit_format->format == CMIT_FMT_USERFORMAT) {
save_user_format(rev, commit_format->user_format,
commit_format->is_tformat);
@@ -1629,6 +1631,72 @@ void pp_title_line(struct pretty_print_context *pp,
strbuf_release(&title);
}
+static int pp_utf8_width(const char *start, const char *end)
+{
+ int width = 0;
+ size_t remain = end - start;
+
+ while (remain) {
+ int n = utf8_width(&start, &remain);
+ if (n < 0 || !start)
+ return -1;
+ width += n;
+ }
+ return width;
+}
+
+static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
+ const char *line, int linelen)
+{
+ const char *tab;
+
+ while ((tab = memchr(line, '\t', linelen)) != NULL) {
+ int width = pp_utf8_width(line, tab);
+
+ /*
+ * If it wasn't well-formed utf8, or it
+ * had characters with badly defined
+ * width (control characters etc), just
+ * give up on trying to align things.
+ */
+ if (width < 0)
+ break;
+
+ /* Output the data .. */
+ strbuf_add(sb, line, tab - line);
+
+ /* .. and the de-tabified tab */
+ strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth));
+
+ /* Skip over the printed part .. */
+ linelen -= tab + 1 - line;
+ line = tab + 1;
+ }
+
+ /*
+ * Print out everything after the last tab without
+ * worrying about width - there's nothing more to
+ * align.
+ */
+ strbuf_add(sb, line, linelen);
+}
+
+/*
+ * pp_handle_indent() prints out the intendation, and
+ * the whole line (without the final newline), after
+ * de-tabifying.
+ */
+static void pp_handle_indent(struct pretty_print_context *pp,
+ struct strbuf *sb, int indent,
+ const char *line, int linelen)
+{
+ strbuf_addchars(sb, ' ', indent);
+ if (pp->expand_tabs_in_log)
+ strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen);
+ else
+ strbuf_add(sb, line, linelen);
+}
+
void pp_remainder(struct pretty_print_context *pp,
const char **msg_p,
struct strbuf *sb,
@@ -1653,8 +1721,12 @@ void pp_remainder(struct pretty_print_context *pp,
strbuf_grow(sb, linelen + indent + 20);
if (indent)
- strbuf_addchars(sb, ' ', indent);
- strbuf_add(sb, line, linelen);
+ pp_handle_indent(pp, sb, indent, line, linelen);
+ else if (pp->expand_tabs_in_log)
+ strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
+ line, linelen);
+ else
+ strbuf_add(sb, line, linelen);
strbuf_addch(sb, '\n');
}
}
diff --git a/quote.c b/quote.c
index fe884d2..b281a8f 100644
--- a/quote.c
+++ b/quote.c
@@ -43,6 +43,19 @@ void sq_quote_buf(struct strbuf *dst, const char *src)
free(to_free);
}
+void sq_quotef(struct strbuf *dst, const char *fmt, ...)
+{
+ struct strbuf src = STRBUF_INIT;
+
+ va_list ap;
+ va_start(ap, fmt);
+ strbuf_vaddf(&src, fmt, ap);
+ va_end(ap);
+
+ sq_quote_buf(dst, src.buf);
+ strbuf_release(&src);
+}
+
void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
{
int i;
diff --git a/quote.h b/quote.h
index 99e04d3..6c53a2c 100644
--- a/quote.h
+++ b/quote.h
@@ -25,10 +25,13 @@ struct strbuf;
* sq_quote_buf() writes to an existing buffer of specified size; it
* will return the number of characters that would have been written
* excluding the final null regardless of the buffer size.
+ *
+ * sq_quotef() quotes the entire formatted string as a single result.
*/
extern void sq_quote_buf(struct strbuf *, const char *src);
extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);
+extern void sq_quotef(struct strbuf *, const char *fmt, ...);
/* 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/reachable.c b/reachable.c
index ed35201..d0199ca 100644
--- a/reachable.c
+++ b/reachable.c
@@ -119,8 +119,7 @@ static int add_recent_loose(const unsigned char *sha1,
*/
if (errno == ENOENT)
return 0;
- return error("unable to stat %s: %s",
- sha1_to_hex(sha1), strerror(errno));
+ return error_errno("unable to stat %s", sha1_to_hex(sha1));
}
add_recent_object(sha1, st.st_mtime, data);
diff --git a/refs.c b/refs.c
index b0e6ece..87dc82f 100644
--- a/refs.c
+++ b/refs.c
@@ -1080,3 +1080,152 @@ int rename_ref_available(const char *oldname, const char *newname)
strbuf_release(&err);
return ret;
}
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ struct object_id oid;
+ int flag;
+
+ if (submodule) {
+ if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
+ return fn("HEAD", &oid, 0, cb_data);
+
+ return 0;
+ }
+
+ if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+ return fn("HEAD", &oid, flag, cb_data);
+
+ return 0;
+}
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+ return head_ref_submodule(NULL, fn, cb_data);
+}
+
+int for_each_ref(each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(NULL, "", fn, 0, 0, cb_data);
+}
+
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(submodule, "", fn, 0, 0, cb_data);
+}
+
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data);
+}
+
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
+{
+ unsigned int flag = 0;
+
+ if (broken)
+ flag = DO_FOR_EACH_INCLUDE_BROKEN;
+ return do_for_each_ref(NULL, prefix, fn, 0, flag, cb_data);
+}
+
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+ each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data);
+}
+
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(NULL, git_replace_ref_base, fn,
+ strlen(git_replace_ref_base), 0, cb_data);
+}
+
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+ struct strbuf buf = STRBUF_INIT;
+ int ret;
+ strbuf_addf(&buf, "%srefs/", get_git_namespace());
+ ret = do_for_each_ref(NULL, buf.buf, fn, 0, 0, cb_data);
+ strbuf_release(&buf);
+ return ret;
+}
+
+int for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+ return do_for_each_ref(NULL, "", fn, 0,
+ DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
+}
+
+/* This function needs to return a meaningful errno on failure */
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags)
+{
+ static struct strbuf sb_refname = STRBUF_INIT;
+ int unused_flags;
+ int symref_count;
+
+ if (!flags)
+ flags = &unused_flags;
+
+ *flags = 0;
+
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+ if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+ !refname_is_safe(refname)) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ /*
+ * dwim_ref() uses REF_ISBROKEN to distinguish between
+ * missing refs and refs that were present but invalid,
+ * to complain about the latter to stderr.
+ *
+ * We don't know whether the ref exists, so don't set
+ * REF_ISBROKEN yet.
+ */
+ *flags |= REF_BAD_NAME;
+ }
+
+ for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
+ unsigned int read_flags = 0;
+
+ if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) {
+ *flags |= read_flags;
+ if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
+ return NULL;
+ hashclr(sha1);
+ if (*flags & REF_BAD_NAME)
+ *flags |= REF_ISBROKEN;
+ return refname;
+ }
+
+ *flags |= read_flags;
+
+ if (!(read_flags & REF_ISSYMREF)) {
+ if (*flags & REF_BAD_NAME) {
+ hashclr(sha1);
+ *flags |= REF_ISBROKEN;
+ }
+ return refname;
+ }
+
+ refname = sb_refname.buf;
+ if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
+ hashclr(sha1);
+ return refname;
+ }
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+ if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+ !refname_is_safe(refname)) {
+ errno = EINVAL;
+ return NULL;
+ }
+
+ *flags |= REF_ISBROKEN | REF_BAD_NAME;
+ }
+ }
+
+ errno = ELOOP;
+ return NULL;
+}
diff --git a/refs.h b/refs.h
index 2f3decb..9230d47 100644
--- a/refs.h
+++ b/refs.h
@@ -306,6 +306,15 @@ extern int rename_ref(const char *oldref, const char *newref, const char *logmsg
extern int create_symref(const char *refname, const char *target, const char *logmsg);
+/*
+ * Update HEAD of the specified gitdir.
+ * Similar to create_symref("relative-git-dir/HEAD", target, NULL), but
+ * this can update the main working tree's HEAD regardless of where
+ * $GIT_DIR points to.
+ * Return 0 if successful, non-zero otherwise.
+ * */
+extern int set_worktree_head_symref(const char *gitdir, const char *target);
+
enum action_on_err {
UPDATE_REFS_MSG_ON_ERR,
UPDATE_REFS_DIE_ON_ERR,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 81f68f8..1f38076 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -513,9 +513,6 @@ static void sort_ref_dir(struct ref_dir *dir)
dir->sorted = dir->nr = i;
}
-/* Include broken references in a do_for_each_ref*() iteration: */
-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
-
/*
* Return true iff the reference described by entry can be resolved to
* an object in the database. Emit a warning if the referred-to
@@ -1272,8 +1269,6 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs)
return get_ref_dir(refs->loose);
}
-/* We allow "recursive" symbolic refs. Only within reason, though */
-#define MAXDEPTH 5
#define MAXREFLEN (1024)
/*
@@ -1303,7 +1298,7 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
char buffer[128], *p;
char *path;
- if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN)
+ if (recursion > SYMREF_MAXDEPTH || strlen(refname) > MAXREFLEN)
return -1;
path = *refs->name
? git_pathdup_submodule(refs->name, "%s", refname)
@@ -1371,13 +1366,11 @@ static struct ref_entry *get_packed_ref(const char *refname)
}
/*
- * A loose ref file doesn't exist; check for a packed ref. The
- * options are forwarded from resolve_safe_unsafe().
+ * A loose ref file doesn't exist; check for a packed ref.
*/
static int resolve_missing_loose_ref(const char *refname,
- int resolve_flags,
unsigned char *sha1,
- int *flags)
+ unsigned int *flags)
{
struct ref_entry *entry;
@@ -1388,205 +1381,158 @@ static int resolve_missing_loose_ref(const char *refname,
entry = get_packed_ref(refname);
if (entry) {
hashcpy(sha1, entry->u.value.oid.hash);
- if (flags)
- *flags |= REF_ISPACKED;
- return 0;
- }
- /* The reference is not a packed reference, either. */
- if (resolve_flags & RESOLVE_REF_READING) {
- errno = ENOENT;
- return -1;
- } else {
- hashclr(sha1);
+ *flags |= REF_ISPACKED;
return 0;
}
+ /* refname is not a packed reference. */
+ return -1;
}
-/* This function needs to return a meaningful errno on failure */
-static const char *resolve_ref_1(const char *refname,
- int resolve_flags,
- unsigned char *sha1,
- int *flags,
- struct strbuf *sb_refname,
- struct strbuf *sb_path,
- struct strbuf *sb_contents)
+/*
+ * Read a raw ref from the filesystem or packed refs file.
+ *
+ * If the ref is a sha1, fill in sha1 and return 0.
+ *
+ * If the ref is symbolic, fill in *symref with the referrent
+ * (e.g. "refs/heads/master") and return 0. The caller is responsible
+ * for validating the referrent. Set REF_ISSYMREF in flags.
+ *
+ * If the ref doesn't exist, set errno to ENOENT and return -1.
+ *
+ * If the ref exists but is neither a symbolic ref nor a sha1, it is
+ * broken. Set REF_ISBROKEN in flags, set errno to EINVAL, and return
+ * -1.
+ *
+ * If there is another error reading the ref, set errno appropriately and
+ * return -1.
+ *
+ * Backend-specific flags might be set in flags as well, regardless of
+ * outcome.
+ *
+ * sb_path is workspace: the caller should allocate and free it.
+ *
+ * It is OK for refname to point into symref. In this case:
+ * - if the function succeeds with REF_ISSYMREF, symref will be
+ * overwritten and the memory pointed to by refname might be changed
+ * or even freed.
+ * - in all other cases, symref will be untouched, and therefore
+ * refname will still be valid and unchanged.
+ */
+int read_raw_ref(const char *refname, unsigned char *sha1,
+ struct strbuf *symref, unsigned int *flags)
{
- int depth = MAXDEPTH;
- int bad_name = 0;
+ struct strbuf sb_contents = STRBUF_INIT;
+ struct strbuf sb_path = STRBUF_INIT;
+ const char *path;
+ const char *buf;
+ struct stat st;
+ int fd;
+ int ret = -1;
+ int save_errno;
- if (flags)
- *flags = 0;
+ strbuf_reset(&sb_path);
+ strbuf_git_path(&sb_path, "%s", refname);
+ path = sb_path.buf;
- if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
- if (flags)
- *flags |= REF_BAD_NAME;
+stat_ref:
+ /*
+ * We might have to loop back here to avoid a race
+ * condition: first we lstat() the file, then we try
+ * to read it as a link or as a file. But if somebody
+ * changes the type of the file (file <-> directory
+ * <-> symlink) between the lstat() and reading, then
+ * we don't want to report that as an error but rather
+ * try again starting with the lstat().
+ */
- if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
- !refname_is_safe(refname)) {
- errno = EINVAL;
- return NULL;
+ if (lstat(path, &st) < 0) {
+ if (errno != ENOENT)
+ goto out;
+ if (resolve_missing_loose_ref(refname, sha1, flags)) {
+ errno = ENOENT;
+ goto out;
}
- /*
- * dwim_ref() uses REF_ISBROKEN to distinguish between
- * missing refs and refs that were present but invalid,
- * to complain about the latter to stderr.
- *
- * We don't know whether the ref exists, so don't set
- * REF_ISBROKEN yet.
- */
- bad_name = 1;
+ ret = 0;
+ goto out;
}
- for (;;) {
- const char *path;
- struct stat st;
- char *buf;
- int fd;
-
- if (--depth < 0) {
- errno = ELOOP;
- return NULL;
- }
-
- strbuf_reset(sb_path);
- strbuf_git_path(sb_path, "%s", refname);
- path = sb_path->buf;
- /*
- * We might have to loop back here to avoid a race
- * condition: first we lstat() the file, then we try
- * to read it as a link or as a file. But if somebody
- * changes the type of the file (file <-> directory
- * <-> symlink) between the lstat() and reading, then
- * we don't want to report that as an error but rather
- * try again starting with the lstat().
- */
- stat_ref:
- if (lstat(path, &st) < 0) {
- if (errno != ENOENT)
- return NULL;
- if (resolve_missing_loose_ref(refname, resolve_flags,
- sha1, flags))
- return NULL;
- if (bad_name) {
- hashclr(sha1);
- if (flags)
- *flags |= REF_ISBROKEN;
- }
- return refname;
- }
-
- /* Follow "normalized" - ie "refs/.." symlinks by hand */
- if (S_ISLNK(st.st_mode)) {
- strbuf_reset(sb_contents);
- if (strbuf_readlink(sb_contents, path, 0) < 0) {
- if (errno == ENOENT || errno == EINVAL)
- /* inconsistent with lstat; retry */
- goto stat_ref;
- else
- return NULL;
- }
- if (starts_with(sb_contents->buf, "refs/") &&
- !check_refname_format(sb_contents->buf, 0)) {
- strbuf_swap(sb_refname, sb_contents);
- refname = sb_refname->buf;
- if (flags)
- *flags |= REF_ISSYMREF;
- if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
- hashclr(sha1);
- return refname;
- }
- continue;
- }
- }
-
- /* Is it a directory? */
- if (S_ISDIR(st.st_mode)) {
- errno = EISDIR;
- return NULL;
- }
-
- /*
- * Anything else, just open it and try to use it as
- * a ref
- */
- fd = open(path, O_RDONLY);
- if (fd < 0) {
- if (errno == ENOENT)
+ /* Follow "normalized" - ie "refs/.." symlinks by hand */
+ if (S_ISLNK(st.st_mode)) {
+ strbuf_reset(&sb_contents);
+ if (strbuf_readlink(&sb_contents, path, 0) < 0) {
+ if (errno == ENOENT || errno == EINVAL)
/* inconsistent with lstat; retry */
goto stat_ref;
else
- return NULL;
+ goto out;
}
- strbuf_reset(sb_contents);
- if (strbuf_read(sb_contents, fd, 256) < 0) {
- int save_errno = errno;
- close(fd);
- errno = save_errno;
- return NULL;
+ if (starts_with(sb_contents.buf, "refs/") &&
+ !check_refname_format(sb_contents.buf, 0)) {
+ strbuf_swap(&sb_contents, symref);
+ *flags |= REF_ISSYMREF;
+ ret = 0;
+ goto out;
}
- close(fd);
- strbuf_rtrim(sb_contents);
+ }
- /*
- * Is it a symbolic ref?
- */
- if (!starts_with(sb_contents->buf, "ref:")) {
- /*
- * Please note that FETCH_HEAD has a second
- * line containing other data.
- */
- if (get_sha1_hex(sb_contents->buf, sha1) ||
- (sb_contents->buf[40] != '\0' && !isspace(sb_contents->buf[40]))) {
- if (flags)
- *flags |= REF_ISBROKEN;
- errno = EINVAL;
- return NULL;
- }
- if (bad_name) {
- hashclr(sha1);
- if (flags)
- *flags |= REF_ISBROKEN;
- }
- return refname;
- }
- if (flags)
- *flags |= REF_ISSYMREF;
- buf = sb_contents->buf + 4;
+ /* Is it a directory? */
+ if (S_ISDIR(st.st_mode)) {
+ errno = EISDIR;
+ goto out;
+ }
+
+ /*
+ * Anything else, just open it and try to use it as
+ * a ref
+ */
+ fd = open(path, O_RDONLY);
+ if (fd < 0) {
+ if (errno == ENOENT)
+ /* inconsistent with lstat; retry */
+ goto stat_ref;
+ else
+ goto out;
+ }
+ strbuf_reset(&sb_contents);
+ if (strbuf_read(&sb_contents, fd, 256) < 0) {
+ int save_errno = errno;
+ close(fd);
+ errno = save_errno;
+ goto out;
+ }
+ close(fd);
+ strbuf_rtrim(&sb_contents);
+ buf = sb_contents.buf;
+ if (starts_with(buf, "ref:")) {
+ buf += 4;
while (isspace(*buf))
buf++;
- strbuf_reset(sb_refname);
- strbuf_addstr(sb_refname, buf);
- refname = sb_refname->buf;
- if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
- hashclr(sha1);
- return refname;
- }
- if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {
- if (flags)
- *flags |= REF_ISBROKEN;
-
- if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
- !refname_is_safe(buf)) {
- errno = EINVAL;
- return NULL;
- }
- bad_name = 1;
- }
+
+ strbuf_reset(symref);
+ strbuf_addstr(symref, buf);
+ *flags |= REF_ISSYMREF;
+ ret = 0;
+ goto out;
}
-}
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
-{
- static struct strbuf sb_refname = STRBUF_INIT;
- struct strbuf sb_contents = STRBUF_INIT;
- struct strbuf sb_path = STRBUF_INIT;
- const char *ret;
+ /*
+ * Please note that FETCH_HEAD has additional
+ * data after the sha.
+ */
+ if (get_sha1_hex(buf, sha1) ||
+ (buf[40] != '\0' && !isspace(buf[40]))) {
+ *flags |= REF_ISBROKEN;
+ errno = EINVAL;
+ goto out;
+ }
+
+ ret = 0;
- ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
- &sb_refname, &sb_path, &sb_contents);
+out:
+ save_errno = errno;
strbuf_release(&sb_path);
strbuf_release(&sb_contents);
+ errno = save_errno;
return ret;
}
@@ -1727,10 +1673,13 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,
* value, stop the iteration and return that value; otherwise, return
* 0.
*/
-static int do_for_each_ref(struct ref_cache *refs, const char *base,
- each_ref_fn fn, int trim, int flags, void *cb_data)
+int do_for_each_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags, void *cb_data)
{
struct ref_entry_cb data;
+ struct ref_cache *refs;
+
+ refs = get_ref_cache(submodule);
data.base = base;
data.trim = trim;
data.flags = flags;
@@ -1745,86 +1694,6 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base,
return do_for_each_entry(refs, base, do_one_ref, &data);
}
-static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- struct object_id oid;
- int flag;
-
- if (submodule) {
- if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
- return fn("HEAD", &oid, 0, cb_data);
-
- return 0;
- }
-
- if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
- return fn("HEAD", &oid, flag, cb_data);
-
- return 0;
-}
-
-int head_ref(each_ref_fn fn, void *cb_data)
-{
- return do_head_ref(NULL, fn, cb_data);
-}
-
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return do_head_ref(submodule, fn, cb_data);
-}
-
-int for_each_ref(each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
-}
-
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data);
-}
-
-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data);
-}
-
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
-{
- unsigned int flag = 0;
-
- if (broken)
- flag = DO_FOR_EACH_INCLUDE_BROKEN;
- return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);
-}
-
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data);
-}
-
-int for_each_replace_ref(each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(&ref_cache, git_replace_ref_base, fn,
- strlen(git_replace_ref_base), 0, cb_data);
-}
-
-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
-{
- struct strbuf buf = STRBUF_INIT;
- int ret;
- strbuf_addf(&buf, "%srefs/", get_git_namespace());
- ret = do_for_each_ref(&ref_cache, buf.buf, fn, 0, 0, cb_data);
- strbuf_release(&buf);
- return ret;
-}
-
-int for_each_rawref(each_ref_fn fn, void *cb_data)
-{
- return do_for_each_ref(&ref_cache, "", fn, 0,
- DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
-}
-
static void unlock_ref(struct ref_lock *lock)
{
/* Do not free lock->lk -- atexit() still looks at them */
@@ -2894,6 +2763,42 @@ int create_symref(const char *refname, const char *target, const char *logmsg)
return ret;
}
+int set_worktree_head_symref(const char *gitdir, const char *target)
+{
+ static struct lock_file head_lock;
+ struct ref_lock *lock;
+ struct strbuf head_path = STRBUF_INIT;
+ const char *head_rel;
+ int ret;
+
+ strbuf_addf(&head_path, "%s/HEAD", absolute_path(gitdir));
+ if (hold_lock_file_for_update(&head_lock, head_path.buf,
+ LOCK_NO_DEREF) < 0) {
+ struct strbuf err = STRBUF_INIT;
+ unable_to_lock_message(head_path.buf, errno, &err);
+ error("%s", err.buf);
+ strbuf_release(&err);
+ strbuf_release(&head_path);
+ return -1;
+ }
+
+ /* head_rel will be "HEAD" for the main tree, "worktrees/wt/HEAD" for
+ linked trees */
+ head_rel = remove_leading_path(head_path.buf,
+ absolute_path(get_git_common_dir()));
+ /* to make use of create_symref_locked(), initialize ref_lock */
+ lock = xcalloc(1, sizeof(struct ref_lock));
+ lock->lk = &head_lock;
+ lock->ref_name = xstrdup(head_rel);
+ lock->orig_ref_name = xstrdup(head_rel);
+
+ ret = create_symref_locked(lock, head_rel, target, NULL);
+
+ unlock_ref(lock); /* will free lock */
+ strbuf_release(&head_path);
+ return ret;
+}
+
int reflog_exists(const char *refname)
{
struct stat st;
@@ -3445,7 +3350,8 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
* reference itself, plus we might need to update the
* reference if --updateref was specified:
*/
- lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);
+ lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, REF_NODEREF,
+ &type, &err);
if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err);
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index c7dded3..3a4f634 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -197,4 +197,19 @@ const char *find_descendant_ref(const char *dirname,
int rename_ref_available(const char *oldname, const char *newname);
+/* We allow "recursive" symbolic refs. Only within reason, though */
+#define SYMREF_MAXDEPTH 5
+
+/* Include broken references in a do_for_each_ref*() iteration: */
+#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+
+/*
+ * The common backend for the for_each_*ref* functions
+ */
+int do_for_each_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags, void *cb_data);
+
+int read_raw_ref(const char *refname, unsigned char *sha1,
+ struct strbuf *symref, unsigned int *flags);
+
#endif /* REFS_REFS_INTERNAL_H */
diff --git a/remote-curl.c b/remote-curl.c
index 15e48e2..672b382 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -474,7 +474,7 @@ static int run_slot(struct active_request_slot *slot,
static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
{
struct active_request_slot *slot;
- struct curl_slist *headers = NULL;
+ struct curl_slist *headers = http_copy_default_headers();
struct strbuf buf = STRBUF_INIT;
int err;
@@ -503,7 +503,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
static int post_rpc(struct rpc_state *rpc)
{
struct active_request_slot *slot;
- struct curl_slist *headers = NULL;
+ struct curl_slist *headers = http_copy_default_headers();
int use_gzip = rpc->gzip_request;
char *gzip_body = NULL;
size_t gzip_size = 0;
diff --git a/remote.c b/remote.c
index fc02698..a326e4e 100644
--- a/remote.c
+++ b/remote.c
@@ -455,7 +455,6 @@ static void read_config(void)
{
static int loaded;
struct object_id oid;
- const char *head_ref;
int flag;
if (loaded)
@@ -463,10 +462,12 @@ static void read_config(void)
loaded = 1;
current_branch = NULL;
- head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
- if (head_ref && (flag & REF_ISSYMREF) &&
- skip_prefix(head_ref, "refs/heads/", &head_ref)) {
- current_branch = make_branch(head_ref, 0);
+ if (startup_info->have_repository) {
+ const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
+ if (head_ref && (flag & REF_ISSYMREF) &&
+ skip_prefix(head_ref, "refs/heads/", &head_ref)) {
+ current_branch = make_branch(head_ref, 0);
+ }
}
git_config(handle_config, NULL);
alias_all_urls();
@@ -1659,7 +1660,7 @@ int branch_merge_matches(struct branch *branch,
return refname_match(branch->merge[i]->src, refname);
}
-__attribute((format (printf,2,3)))
+__attribute__((format (printf,2,3)))
static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
if (err) {
@@ -2107,7 +2108,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, "
"respectively.\n",
- theirs),
+ ours + theirs),
base, ours, theirs);
if (advice_status_hints)
strbuf_addf(sb,
diff --git a/rerere.c b/rerere.c
index 587b7e2..aaadec1 100644
--- a/rerere.c
+++ b/rerere.c
@@ -8,6 +8,7 @@
#include "ll-merge.h"
#include "attr.h"
#include "pathspec.h"
+#include "sha1-lookup.h"
#define RESOLVED 0
#define PUNTED 1
@@ -20,6 +21,29 @@ static int rerere_enabled = -1;
/* automatically update cleanly resolved paths to the index */
static int rerere_autoupdate;
+static int rerere_dir_nr;
+static int rerere_dir_alloc;
+
+#define RR_HAS_POSTIMAGE 1
+#define RR_HAS_PREIMAGE 2
+static struct rerere_dir {
+ unsigned char sha1[20];
+ int status_alloc, status_nr;
+ unsigned char *status;
+} **rerere_dir;
+
+static void free_rerere_dirs(void)
+{
+ int i;
+ for (i = 0; i < rerere_dir_nr; i++) {
+ free(rerere_dir[i]->status);
+ free(rerere_dir[i]);
+ }
+ free(rerere_dir);
+ rerere_dir_nr = rerere_dir_alloc = 0;
+ rerere_dir = NULL;
+}
+
static void free_rerere_id(struct string_list_item *item)
{
free(item->util);
@@ -27,7 +51,33 @@ static void free_rerere_id(struct string_list_item *item)
static const char *rerere_id_hex(const struct rerere_id *id)
{
- return id->hex;
+ return sha1_to_hex(id->collection->sha1);
+}
+
+static void fit_variant(struct rerere_dir *rr_dir, int variant)
+{
+ variant++;
+ ALLOC_GROW(rr_dir->status, variant, rr_dir->status_alloc);
+ if (rr_dir->status_nr < variant) {
+ memset(rr_dir->status + rr_dir->status_nr,
+ '\0', variant - rr_dir->status_nr);
+ rr_dir->status_nr = variant;
+ }
+}
+
+static void assign_variant(struct rerere_id *id)
+{
+ int variant;
+ struct rerere_dir *rr_dir = id->collection;
+
+ variant = id->variant;
+ if (variant < 0) {
+ for (variant = 0; variant < rr_dir->status_nr; variant++)
+ if (!rr_dir->status[variant])
+ break;
+ }
+ fit_variant(rr_dir, variant);
+ id->variant = variant;
}
const char *rerere_path(const struct rerere_id *id, const char *file)
@@ -35,20 +85,103 @@ const char *rerere_path(const struct rerere_id *id, const char *file)
if (!file)
return git_path("rr-cache/%s", rerere_id_hex(id));
- return git_path("rr-cache/%s/%s", rerere_id_hex(id), file);
+ if (id->variant <= 0)
+ return git_path("rr-cache/%s/%s", rerere_id_hex(id), file);
+
+ return git_path("rr-cache/%s/%s.%d",
+ rerere_id_hex(id), file, id->variant);
+}
+
+static int is_rr_file(const char *name, const char *filename, int *variant)
+{
+ const char *suffix;
+ char *ep;
+
+ if (!strcmp(name, filename)) {
+ *variant = 0;
+ return 1;
+ }
+ if (!skip_prefix(name, filename, &suffix) || *suffix != '.')
+ return 0;
+
+ errno = 0;
+ *variant = strtol(suffix + 1, &ep, 10);
+ if (errno || *ep)
+ return 0;
+ return 1;
+}
+
+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->sha1)));
+
+ if (!dir)
+ return;
+ while ((de = readdir(dir)) != NULL) {
+ int variant;
+
+ if (is_rr_file(de->d_name, "postimage", &variant)) {
+ fit_variant(rr_dir, variant);
+ rr_dir->status[variant] |= RR_HAS_POSTIMAGE;
+ } else if (is_rr_file(de->d_name, "preimage", &variant)) {
+ fit_variant(rr_dir, variant);
+ rr_dir->status[variant] |= RR_HAS_PREIMAGE;
+ }
+ }
+ closedir(dir);
+}
+
+static const unsigned char *rerere_dir_sha1(size_t i, void *table)
+{
+ struct rerere_dir **rr_dir = table;
+ return rr_dir[i]->sha1;
+}
+
+static struct rerere_dir *find_rerere_dir(const char *hex)
+{
+ unsigned char sha1[20];
+ struct rerere_dir *rr_dir;
+ int pos;
+
+ if (get_sha1_hex(hex, sha1))
+ return NULL; /* BUG */
+ pos = sha1_pos(sha1, rerere_dir, rerere_dir_nr, rerere_dir_sha1);
+ if (pos < 0) {
+ rr_dir = xmalloc(sizeof(*rr_dir));
+ hashcpy(rr_dir->sha1, sha1);
+ rr_dir->status = NULL;
+ rr_dir->status_nr = 0;
+ rr_dir->status_alloc = 0;
+ pos = -1 - pos;
+
+ /* Make sure the array is big enough ... */
+ ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc);
+ /* ... and add it in. */
+ rerere_dir_nr++;
+ memmove(rerere_dir + pos + 1, rerere_dir + pos,
+ (rerere_dir_nr - pos - 1) * sizeof(*rerere_dir));
+ rerere_dir[pos] = rr_dir;
+ scan_rerere_dir(rr_dir);
+ }
+ return rerere_dir[pos];
}
static int has_rerere_resolution(const struct rerere_id *id)
{
- struct stat st;
+ const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE;
+ int variant = id->variant;
- return !stat(rerere_path(id, "postimage"), &st);
+ if (variant < 0)
+ return 0;
+ return ((id->collection->status[variant] & both) == both);
}
static struct rerere_id *new_rerere_id_hex(char *hex)
{
struct rerere_id *id = xmalloc(sizeof(*id));
- xsnprintf(id->hex, sizeof(id->hex), "%s", hex);
+ id->collection = find_rerere_dir(hex);
+ id->variant = -1; /* not known yet */
return id;
}
@@ -75,16 +208,26 @@ static void read_rr(struct string_list *rr)
char *path;
unsigned char sha1[20];
struct rerere_id *id;
+ int variant;
/* There has to be the hash, tab, path and then NUL */
if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))
die("corrupt MERGE_RR");
- if (buf.buf[40] != '\t')
+ if (buf.buf[40] != '.') {
+ variant = 0;
+ path = buf.buf + 40;
+ } else {
+ errno = 0;
+ variant = strtol(buf.buf + 41, &path, 10);
+ if (errno)
+ die("corrupt MERGE_RR");
+ }
+ if (*(path++) != '\t')
die("corrupt MERGE_RR");
buf.buf[40] = '\0';
- path = buf.buf + 41;
id = new_rerere_id_hex(buf.buf);
+ id->variant = variant;
string_list_insert(rr, path)->util = id;
}
strbuf_release(&buf);
@@ -105,9 +248,16 @@ static int write_rr(struct string_list *rr, int out_fd)
id = rr->items[i].util;
if (!id)
continue;
- strbuf_addf(&buf, "%s\t%s%c",
- rerere_id_hex(id),
- rr->items[i].string, 0);
+ assert(id->variant >= 0);
+ if (0 < id->variant)
+ strbuf_addf(&buf, "%s.%d\t%s%c",
+ rerere_id_hex(id), id->variant,
+ rr->items[i].string, 0);
+ else
+ strbuf_addf(&buf, "%s\t%s%c",
+ rerere_id_hex(id),
+ rr->items[i].string, 0);
+
if (write_in_full(out_fd, buf.buf, buf.len) != buf.len)
die("unable to write rerere record");
@@ -351,8 +501,7 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
error("There were errors while writing %s (%s)",
path, strerror(io.io.wrerror));
if (io.io.output && fclose(io.io.output))
- io.io.wrerror = error("Failed to flush %s: %s",
- path, strerror(errno));
+ io.io.wrerror = error_errno("Failed to flush %s", path);
if (hunk_no < 0) {
if (output)
@@ -365,103 +514,6 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
}
/*
- * Subclass of rerere_io that reads from an in-core buffer that is a
- * strbuf
- */
-struct rerere_io_mem {
- struct rerere_io io;
- struct strbuf input;
-};
-
-/*
- * ... and its getline() method implementation
- */
-static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
-{
- struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
- char *ep;
- size_t len;
-
- strbuf_release(sb);
- if (!io->input.len)
- return -1;
- ep = memchr(io->input.buf, '\n', io->input.len);
- if (!ep)
- ep = io->input.buf + io->input.len;
- else if (*ep == '\n')
- ep++;
- len = ep - io->input.buf;
- strbuf_add(sb, io->input.buf, len);
- strbuf_remove(&io->input, 0, len);
- return 0;
-}
-
-static int handle_cache(const char *path, unsigned char *sha1, const char *output)
-{
- mmfile_t mmfile[3] = {{NULL}};
- mmbuffer_t result = {NULL, 0};
- const struct cache_entry *ce;
- int pos, len, i, hunk_no;
- struct rerere_io_mem io;
- int marker_size = ll_merge_marker_size(path);
-
- /*
- * Reproduce the conflicted merge in-core
- */
- len = strlen(path);
- pos = cache_name_pos(path, len);
- if (0 <= pos)
- return -1;
- pos = -pos - 1;
-
- while (pos < active_nr) {
- enum object_type type;
- unsigned long size;
-
- ce = active_cache[pos++];
- if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
- break;
- i = ce_stage(ce) - 1;
- if (!mmfile[i].ptr) {
- mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
- mmfile[i].size = size;
- }
- }
- for (i = 0; i < 3; i++)
- if (!mmfile[i].ptr && !mmfile[i].size)
- mmfile[i].ptr = xstrdup("");
-
- /*
- * NEEDSWORK: handle conflicts from merges with
- * merge.renormalize set, too
- */
- ll_merge(&result, path, &mmfile[0], NULL,
- &mmfile[1], "ours",
- &mmfile[2], "theirs", NULL);
- for (i = 0; i < 3; i++)
- free(mmfile[i].ptr);
-
- memset(&io, 0, sizeof(io));
- io.io.getline = rerere_mem_getline;
- if (output)
- io.io.output = fopen(output, "w");
- else
- io.io.output = NULL;
- strbuf_init(&io.input, 0);
- strbuf_attach(&io.input, result.ptr, result.size, result.size);
-
- /*
- * Grab the conflict ID and optionally write the original
- * contents with conflict markers out.
- */
- hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
- strbuf_release(&io.input);
- if (io.io.output)
- fclose(io.io.output);
- return hunk_no;
-}
-
-/*
* Look at a cache entry at "i" and see if it is not conflicting,
* conflicting and we are willing to handle, or conflicting and
* we are unable to handle, and return the determination in *type.
@@ -569,6 +621,33 @@ int rerere_remaining(struct string_list *merge_rr)
}
/*
+ * Try using the given conflict resolution "ID" to see
+ * if that recorded conflict resolves cleanly what we
+ * got in the "cur".
+ */
+static int try_merge(const struct rerere_id *id, const char *path,
+ mmfile_t *cur, mmbuffer_t *result)
+{
+ int ret;
+ mmfile_t base = {NULL, 0}, other = {NULL, 0};
+
+ if (read_mmfile(&base, rerere_path(id, "preimage")) ||
+ read_mmfile(&other, rerere_path(id, "postimage")))
+ ret = 1;
+ else
+ /*
+ * A three-way merge. Note that this honors user-customizable
+ * low-level merge driver settings.
+ */
+ ret = ll_merge(result, path, &base, NULL, cur, "", &other, "", NULL);
+
+ free(base.ptr);
+ free(other.ptr);
+
+ return ret;
+}
+
+/*
* Find the conflict identified by "id"; the change between its
* "preimage" (i.e. a previous contents with conflict markers) and its
* "postimage" (i.e. the corresponding contents with conflicts
@@ -582,30 +661,20 @@ static int merge(const struct rerere_id *id, const char *path)
{
FILE *f;
int ret;
- mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
+ mmfile_t cur = {NULL, 0};
mmbuffer_t result = {NULL, 0};
/*
* Normalize the conflicts in path and write it out to
* "thisimage" temporary file.
*/
- if (handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) {
- ret = 1;
- goto out;
- }
-
- if (read_mmfile(&cur, rerere_path(id, "thisimage")) ||
- read_mmfile(&base, rerere_path(id, "preimage")) ||
- read_mmfile(&other, rerere_path(id, "postimage"))) {
+ if ((handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) ||
+ read_mmfile(&cur, rerere_path(id, "thisimage"))) {
ret = 1;
goto out;
}
- /*
- * A three-way merge. Note that this honors user-customizable
- * low-level merge driver settings.
- */
- ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL);
+ ret = try_merge(id, path, &cur, &result);
if (ret)
goto out;
@@ -614,25 +683,20 @@ static int merge(const struct rerere_id *id, const char *path)
* Mark that "postimage" was used to help gc.
*/
if (utime(rerere_path(id, "postimage"), NULL) < 0)
- warning("failed utime() on %s: %s",
- rerere_path(id, "postimage"),
- strerror(errno));
+ warning_errno("failed utime() on %s",
+ rerere_path(id, "postimage"));
/* Update "path" with the resolution */
f = fopen(path, "w");
if (!f)
- return error("Could not open %s: %s", path,
- strerror(errno));
+ return error_errno("Could not open %s", path);
if (fwrite(result.ptr, result.size, 1, f) != 1)
- error("Could not write %s: %s", path, strerror(errno));
+ error_errno("Could not write %s", path);
if (fclose(f))
- return error("Writing %s failed: %s", path,
- strerror(errno));
+ return error_errno("Writing %s failed", path);
out:
free(cur.ptr);
- free(base.ptr);
- free(other.ptr);
free(result.ptr);
return ret;
@@ -661,6 +725,13 @@ static void update_paths(struct string_list *update)
rollback_lock_file(&index_lock);
}
+static void remove_variant(struct rerere_id *id)
+{
+ unlink_or_warn(rerere_path(id, "postimage"));
+ unlink_or_warn(rerere_path(id, "preimage"));
+ id->collection->status[id->variant] = 0;
+}
+
/*
* The path indicated by rr_item may still have conflict for which we
* have a recorded resolution, in which case replay it and optionally
@@ -672,12 +743,47 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
struct string_list *update)
{
const char *path = rr_item->string;
- const struct rerere_id *id = rr_item->util;
+ struct rerere_id *id = rr_item->util;
+ struct rerere_dir *rr_dir = id->collection;
+ int variant;
+
+ variant = id->variant;
+
+ /* Has the user resolved it already? */
+ if (variant >= 0) {
+ if (!handle_file(path, NULL, NULL)) {
+ copy_file(rerere_path(id, "postimage"), path, 0666);
+ id->collection->status[variant] |= RR_HAS_POSTIMAGE;
+ fprintf(stderr, "Recorded resolution for '%s'.\n", path);
+ free_rerere_id(rr_item);
+ rr_item->util = NULL;
+ return;
+ }
+ /*
+ * There may be other variants that can cleanly
+ * replay. Try them and update the variant number for
+ * this one.
+ */
+ }
+
+ /* Does any existing resolution apply cleanly? */
+ for (variant = 0; variant < rr_dir->status_nr; variant++) {
+ const int both = RR_HAS_PREIMAGE | RR_HAS_POSTIMAGE;
+ struct rerere_id vid = *id;
+
+ if ((rr_dir->status[variant] & both) != both)
+ continue;
+
+ vid.variant = variant;
+ if (merge(&vid, path))
+ continue; /* failed to replay */
- /* Is there a recorded resolution we could attempt to apply? */
- if (has_rerere_resolution(id)) {
- if (merge(id, path))
- return; /* failed to replay */
+ /*
+ * If there already is a different variant that applies
+ * cleanly, there is no point maintaining our own variant.
+ */
+ if (0 <= id->variant && id->variant != variant)
+ remove_variant(id);
if (rerere_autoupdate)
string_list_insert(update, path);
@@ -685,15 +791,24 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
fprintf(stderr,
"Resolved '%s' using previous resolution.\n",
path);
- } else if (!handle_file(path, NULL, NULL)) {
- /* The user has resolved it. */
- copy_file(rerere_path(id, "postimage"), path, 0666);
- fprintf(stderr, "Recorded resolution for '%s'.\n", path);
- } else {
+ free_rerere_id(rr_item);
+ rr_item->util = NULL;
return;
}
- free_rerere_id(rr_item);
- rr_item->util = NULL;
+
+ /* None of the existing one applies; we need a new variant */
+ assign_variant(id);
+
+ variant = id->variant;
+ handle_file(path, NULL, rerere_path(id, "preimage"));
+ if (id->collection->status[variant] & RR_HAS_POSTIMAGE) {
+ const char *path = rerere_path(id, "postimage");
+ if (unlink(path))
+ die_errno("cannot unlink stray '%s'", path);
+ id->collection->status[variant] &= ~RR_HAS_POSTIMAGE;
+ }
+ id->collection->status[variant] |= RR_HAS_PREIMAGE;
+ fprintf(stderr, "Recorded preimage for '%s'\n", path);
}
static int do_plain_rerere(struct string_list *rr, int fd)
@@ -731,24 +846,8 @@ static int do_plain_rerere(struct string_list *rr, int fd)
id = new_rerere_id(sha1);
string_list_insert(rr, path)->util = id;
- /*
- * If the directory does not exist, create
- * it. mkdir_in_gitdir() will fail with
- * EEXIST if there already is one.
- *
- * NEEDSWORK: make sure "gc" does not remove
- * preimage without removing the directory.
- */
- if (mkdir_in_gitdir(rerere_path(id, NULL)))
- continue;
-
- /*
- * We are the first to encounter this
- * conflict. Ask handle_file() to write the
- * normalized contents to the "preimage" file.
- */
- handle_file(path, NULL, rerere_path(id, "preimage"));
- fprintf(stderr, "Recorded preimage for '%s'\n", path);
+ /* Ensure that the directory exists. */
+ mkdir_in_gitdir(rerere_path(id, NULL));
}
for (i = 0; i < rr->nr; i++)
@@ -812,12 +911,111 @@ int setup_rerere(struct string_list *merge_rr, int flags)
int rerere(int flags)
{
struct string_list merge_rr = STRING_LIST_INIT_DUP;
- int fd;
+ int fd, status;
fd = setup_rerere(&merge_rr, flags);
if (fd < 0)
return 0;
- return do_plain_rerere(&merge_rr, fd);
+ status = do_plain_rerere(&merge_rr, fd);
+ free_rerere_dirs();
+ return status;
+}
+
+/*
+ * Subclass of rerere_io that reads from an in-core buffer that is a
+ * strbuf
+ */
+struct rerere_io_mem {
+ struct rerere_io io;
+ struct strbuf input;
+};
+
+/*
+ * ... and its getline() method implementation
+ */
+static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_)
+{
+ struct rerere_io_mem *io = (struct rerere_io_mem *)io_;
+ char *ep;
+ size_t len;
+
+ strbuf_release(sb);
+ if (!io->input.len)
+ return -1;
+ ep = memchr(io->input.buf, '\n', io->input.len);
+ if (!ep)
+ ep = io->input.buf + io->input.len;
+ else if (*ep == '\n')
+ ep++;
+ len = ep - io->input.buf;
+ strbuf_add(sb, io->input.buf, len);
+ strbuf_remove(&io->input, 0, len);
+ return 0;
+}
+
+static int handle_cache(const char *path, unsigned char *sha1, const char *output)
+{
+ mmfile_t mmfile[3] = {{NULL}};
+ mmbuffer_t result = {NULL, 0};
+ const struct cache_entry *ce;
+ int pos, len, i, hunk_no;
+ struct rerere_io_mem io;
+ int marker_size = ll_merge_marker_size(path);
+
+ /*
+ * Reproduce the conflicted merge in-core
+ */
+ len = strlen(path);
+ pos = cache_name_pos(path, len);
+ if (0 <= pos)
+ return -1;
+ pos = -pos - 1;
+
+ while (pos < active_nr) {
+ enum object_type type;
+ unsigned long size;
+
+ ce = active_cache[pos++];
+ if (ce_namelen(ce) != len || memcmp(ce->name, path, len))
+ break;
+ i = ce_stage(ce) - 1;
+ if (!mmfile[i].ptr) {
+ mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size);
+ mmfile[i].size = size;
+ }
+ }
+ for (i = 0; i < 3; i++)
+ if (!mmfile[i].ptr && !mmfile[i].size)
+ mmfile[i].ptr = xstrdup("");
+
+ /*
+ * NEEDSWORK: handle conflicts from merges with
+ * merge.renormalize set, too?
+ */
+ ll_merge(&result, path, &mmfile[0], NULL,
+ &mmfile[1], "ours",
+ &mmfile[2], "theirs", NULL);
+ for (i = 0; i < 3; i++)
+ free(mmfile[i].ptr);
+
+ memset(&io, 0, sizeof(io));
+ io.io.getline = rerere_mem_getline;
+ if (output)
+ io.io.output = fopen(output, "w");
+ else
+ io.io.output = NULL;
+ strbuf_init(&io.input, 0);
+ strbuf_attach(&io.input, result.ptr, result.size, result.size);
+
+ /*
+ * Grab the conflict ID and optionally write the original
+ * contents with conflict markers out.
+ */
+ hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size);
+ strbuf_release(&io.input);
+ if (io.io.output)
+ fclose(io.io.output);
+ return hunk_no;
}
static int rerere_forget_one_path(const char *path, struct string_list *rr)
@@ -838,11 +1036,43 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
/* Nuke the recorded resolution for the conflict */
id = new_rerere_id(sha1);
+
+ for (id->variant = 0;
+ id->variant < id->collection->status_nr;
+ id->variant++) {
+ mmfile_t cur = { NULL, 0 };
+ mmbuffer_t result = {NULL, 0};
+ int cleanly_resolved;
+
+ if (!has_rerere_resolution(id))
+ continue;
+
+ handle_cache(path, sha1, rerere_path(id, "thisimage"));
+ if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
+ free(cur.ptr);
+ error("Failed to update conflicted state in '%s'", path);
+ goto fail_exit;
+ }
+ cleanly_resolved = !try_merge(id, path, &cur, &result);
+ free(result.ptr);
+ free(cur.ptr);
+ if (cleanly_resolved)
+ break;
+ }
+
+ if (id->collection->status_nr <= id->variant) {
+ error("no remembered resolution for '%s'", path);
+ goto fail_exit;
+ }
+
filename = rerere_path(id, "postimage");
- if (unlink(filename))
- return (errno == ENOENT
- ? error("no remembered resolution for %s", path)
- : error("cannot unlink %s: %s", filename, strerror(errno)));
+ if (unlink(filename)) {
+ if (errno == ENOENT)
+ error("no remembered resolution for %s", path);
+ else
+ error_errno("cannot unlink %s", filename);
+ goto fail_exit;
+ }
/*
* Update the preimage so that the user can resolve the
@@ -861,6 +1091,10 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
item->util = id;
fprintf(stderr, "Forgot resolution for %s\n", path);
return 0;
+
+fail_exit:
+ free(id);
+ return -1;
}
int rerere_forget(struct pathspec *pathspec)
@@ -897,29 +1131,16 @@ int rerere_forget(struct pathspec *pathspec)
* Garbage collection support
*/
-/*
- * Note that this is not reentrant but is used only one-at-a-time
- * so it does not matter right now.
- */
-static struct rerere_id *dirname_to_id(const char *name)
-{
- static struct rerere_id id;
- xsnprintf(id.hex, sizeof(id.hex), "%s", name);
- return &id;
-}
-
-static time_t rerere_created_at(const char *dir_name)
+static time_t rerere_created_at(struct rerere_id *id)
{
struct stat st;
- struct rerere_id *id = dirname_to_id(dir_name);
return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
}
-static time_t rerere_last_used_at(const char *dir_name)
+static time_t rerere_last_used_at(struct rerere_id *id)
{
struct stat st;
- struct rerere_id *id = dirname_to_id(dir_name);
return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime;
}
@@ -929,15 +1150,28 @@ static time_t rerere_last_used_at(const char *dir_name)
*/
static void unlink_rr_item(struct rerere_id *id)
{
- unlink(rerere_path(id, "thisimage"));
- unlink(rerere_path(id, "preimage"));
- unlink(rerere_path(id, "postimage"));
- /*
- * NEEDSWORK: what if this rmdir() fails? Wouldn't we then
- * assume that we already have preimage recorded in
- * do_plain_rerere()?
- */
- rmdir(rerere_path(id, NULL));
+ unlink_or_warn(rerere_path(id, "thisimage"));
+ remove_variant(id);
+ id->collection->status[id->variant] = 0;
+}
+
+static void prune_one(struct rerere_id *id, time_t now,
+ int cutoff_resolve, int cutoff_noresolve)
+{
+ time_t then;
+ int cutoff;
+
+ then = rerere_last_used_at(id);
+ if (then)
+ cutoff = cutoff_resolve;
+ else {
+ then = rerere_created_at(id);
+ if (!then)
+ return;
+ cutoff = cutoff_noresolve;
+ }
+ if (then < now - cutoff * 86400)
+ unlink_rr_item(id);
}
void rerere_gc(struct string_list *rr)
@@ -945,8 +1179,8 @@ void rerere_gc(struct string_list *rr)
struct string_list to_remove = STRING_LIST_INIT_DUP;
DIR *dir;
struct dirent *e;
- int i, cutoff;
- time_t now = time(NULL), then;
+ int i;
+ time_t now = time(NULL);
int cutoff_noresolve = 15;
int cutoff_resolve = 60;
@@ -961,25 +1195,32 @@ void rerere_gc(struct string_list *rr)
die_errno("unable to open rr-cache directory");
/* Collect stale conflict IDs ... */
while ((e = readdir(dir))) {
+ struct rerere_dir *rr_dir;
+ struct rerere_id id;
+ int now_empty;
+
if (is_dot_or_dotdot(e->d_name))
continue;
-
- then = rerere_last_used_at(e->d_name);
- if (then) {
- cutoff = cutoff_resolve;
- } else {
- then = rerere_created_at(e->d_name);
- if (!then)
- continue;
- cutoff = cutoff_noresolve;
+ rr_dir = find_rerere_dir(e->d_name);
+ if (!rr_dir)
+ continue; /* or should we remove e->d_name? */
+
+ now_empty = 1;
+ for (id.variant = 0, id.collection = rr_dir;
+ id.variant < id.collection->status_nr;
+ id.variant++) {
+ prune_one(&id, now, cutoff_resolve, cutoff_noresolve);
+ if (id.collection->status[id.variant])
+ now_empty = 0;
}
- if (then < now - cutoff * 86400)
+ if (now_empty)
string_list_append(&to_remove, e->d_name);
}
closedir(dir);
- /* ... and then remove them one-by-one */
+
+ /* ... and then remove the empty directories */
for (i = 0; i < to_remove.nr; i++)
- unlink_rr_item(dirname_to_id(to_remove.items[i].string));
+ rmdir(git_path("rr-cache/%s", to_remove.items[i].string));
string_list_clear(&to_remove, 0);
rollback_lock_file(&write_lock);
}
@@ -1000,8 +1241,10 @@ void rerere_clear(struct string_list *merge_rr)
for (i = 0; i < merge_rr->nr; i++) {
struct rerere_id *id = merge_rr->items[i].util;
- if (!has_rerere_resolution(id))
+ if (!has_rerere_resolution(id)) {
unlink_rr_item(id);
+ rmdir(rerere_path(id, NULL));
+ }
}
unlink_or_warn(git_path_merge_rr());
rollback_lock_file(&write_lock);
diff --git a/rerere.h b/rerere.h
index 1222e91..c2961fe 100644
--- a/rerere.h
+++ b/rerere.h
@@ -16,8 +16,10 @@ struct pathspec;
*/
extern void *RERERE_RESOLVED;
+struct rerere_dir;
struct rerere_id {
- char hex[41];
+ struct rerere_dir *collection;
+ int variant;
};
extern int setup_rerere(struct string_list *, int);
diff --git a/revision.c b/revision.c
index 8b2dfe3..d30d1c4 100644
--- a/revision.c
+++ b/revision.c
@@ -59,10 +59,10 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
while (tree_entry(&desc, &entry)) {
switch (object_type(entry.mode)) {
case OBJ_TREE:
- mark_tree_uninteresting(lookup_tree(entry.sha1));
+ mark_tree_uninteresting(lookup_tree(entry.oid->hash));
break;
case OBJ_BLOB:
- mark_blob_uninteresting(lookup_blob(entry.sha1));
+ mark_blob_uninteresting(lookup_blob(entry.oid->hash));
break;
default:
/* Subproject commit - not in this repository */
@@ -1356,8 +1356,10 @@ void init_revisions(struct rev_info *revs, const char *prefix)
revs->skip_count = -1;
revs->max_count = -1;
revs->max_parents = -1;
+ revs->expand_tabs_in_log = -1;
revs->commit_format = CMIT_FMT_DEFAULT;
+ revs->expand_tabs_in_log_default = 8;
init_grep_defaults();
grep_init(&revs->grep_filter, prefix);
@@ -1854,6 +1856,15 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->verbose_header = 1;
revs->pretty_given = 1;
get_commit_format(arg+9, revs);
+ } else if (!strcmp(arg, "--expand-tabs")) {
+ revs->expand_tabs_in_log = 8;
+ } else if (!strcmp(arg, "--no-expand-tabs")) {
+ revs->expand_tabs_in_log = 0;
+ } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
+ int val;
+ if (strtol_i(arg, 10, &val) < 0 || val < 0)
+ 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;
revs->show_notes_given = 1;
@@ -2327,6 +2338,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if (revs->first_parent_only && revs->bisect)
die(_("--first-parent is incompatible with --bisect"));
+ if (revs->expand_tabs_in_log < 0)
+ revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
+
return left;
}
diff --git a/revision.h b/revision.h
index dca0d38..9fac1a6 100644
--- a/revision.h
+++ b/revision.h
@@ -148,6 +148,8 @@ struct rev_info {
linear:1;
struct date_mode date_mode;
+ int expand_tabs_in_log; /* unset if negative */
+ int expand_tabs_in_log_default;
unsigned int abbrev;
enum cmit_fmt commit_format;
diff --git a/run-command.c b/run-command.c
index c726010..af0c8a1 100644
--- a/run-command.c
+++ b/run-command.c
@@ -233,7 +233,7 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
if (waiting < 0) {
failed_errno = errno;
- error("waitpid for %s failed: %s", argv0, strerror(errno));
+ error_errno("waitpid for %s failed", argv0);
} else if (waiting != pid) {
error("waitpid is confused (%s)", argv0);
} else if (WIFSIGNALED(status)) {
@@ -420,8 +420,7 @@ fail_pipe:
}
}
if (cmd->pid < 0)
- error("cannot fork() for %s: %s", cmd->argv[0],
- strerror(errno));
+ error_errno("cannot fork() for %s", cmd->argv[0]);
else if (cmd->clean_on_exit)
mark_child_for_cleanup(cmd->pid);
@@ -482,7 +481,7 @@ fail_pipe:
cmd->dir, fhin, fhout, fherr);
failed_errno = errno;
if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
- error("cannot spawn %s: %s", cmd->argv[0], strerror(errno));
+ error_errno("cannot spawn %s", cmd->argv[0]);
if (cmd->clean_on_exit && cmd->pid >= 0)
mark_child_for_cleanup(cmd->pid);
@@ -590,6 +589,16 @@ static void *run_thread(void *data)
struct async *async = data;
intptr_t ret;
+ if (async->isolate_sigpipe) {
+ sigset_t mask;
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGPIPE);
+ if (pthread_sigmask(SIG_BLOCK, &mask, NULL) < 0) {
+ ret = error("unable to block SIGPIPE in async thread");
+ return (void *)ret;
+ }
+ }
+
pthread_setspecific(async_key, async);
ret = async->proc(async->proc_in, async->proc_out, async->data);
return (void *)ret;
@@ -693,7 +702,7 @@ int start_async(struct async *async)
if (pipe(fdin) < 0) {
if (async->out > 0)
close(async->out);
- return error("cannot create pipe: %s", strerror(errno));
+ return error_errno("cannot create pipe");
}
async->in = fdin[1];
}
@@ -705,7 +714,7 @@ int start_async(struct async *async)
close_pair(fdin);
else if (async->in)
close(async->in);
- return error("cannot create pipe: %s", strerror(errno));
+ return error_errno("cannot create pipe");
}
async->out = fdout[0];
}
@@ -730,7 +739,7 @@ int start_async(struct async *async)
async->pid = fork();
if (async->pid < 0) {
- error("fork (async) failed: %s", strerror(errno));
+ error_errno("fork (async) failed");
goto error;
}
if (!async->pid) {
@@ -777,7 +786,7 @@ int start_async(struct async *async)
{
int err = pthread_create(&async->tid, NULL, run_thread, async);
if (err) {
- error("cannot create thread: %s", strerror(err));
+ error_errno("cannot create thread");
goto error;
}
}
@@ -815,7 +824,10 @@ const char *find_hook(const char *name)
static struct strbuf path = STRBUF_INIT;
strbuf_reset(&path);
- strbuf_git_path(&path, "hooks/%s", name);
+ if (git_hooks_path)
+ strbuf_addf(&path, "%s/%s", git_hooks_path, name);
+ else
+ strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0)
return NULL;
return path.buf;
@@ -902,7 +914,7 @@ struct parallel_processes {
struct strbuf buffered_output; /* of finished children */
};
-static int default_start_failure(struct strbuf *err,
+static int default_start_failure(struct strbuf *out,
void *pp_cb,
void *pp_task_cb)
{
@@ -910,7 +922,7 @@ static int default_start_failure(struct strbuf *err,
}
static int default_task_finished(int result,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void *pp_task_cb)
{
@@ -994,7 +1006,7 @@ static void pp_cleanup(struct parallel_processes *pp)
* When get_next_task added messages to the buffer in its last
* iteration, the buffered output is non empty.
*/
- fputs(pp->buffered_output.buf, stderr);
+ strbuf_write(&pp->buffered_output, stderr);
strbuf_release(&pp->buffered_output);
sigchain_pop_common();
@@ -1079,7 +1091,7 @@ static void pp_output(struct parallel_processes *pp)
int i = pp->output_owner;
if (pp->children[i].state == GIT_CP_WORKING &&
pp->children[i].err.len) {
- fputs(pp->children[i].err.buf, stderr);
+ strbuf_write(&pp->children[i].err, stderr);
strbuf_reset(&pp->children[i].err);
}
}
@@ -1117,11 +1129,11 @@ static int pp_collect_finished(struct parallel_processes *pp)
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err);
} else {
- fputs(pp->children[i].err.buf, stderr);
+ strbuf_write(&pp->children[i].err, stderr);
strbuf_reset(&pp->children[i].err);
/* Output all other finished child processes */
- fputs(pp->buffered_output.buf, stderr);
+ strbuf_write(&pp->buffered_output, stderr);
strbuf_reset(&pp->buffered_output);
/*
diff --git a/run-command.h b/run-command.h
index 3d1e59e..11f76b0 100644
--- a/run-command.h
+++ b/run-command.h
@@ -116,6 +116,7 @@ struct async {
int proc_in;
int proc_out;
#endif
+ int isolate_sigpipe;
};
int start_async(struct async *async);
@@ -140,7 +141,7 @@ void NORETURN async_exit(int code);
* return the negative signal number.
*/
typedef int (*get_next_task_fn)(struct child_process *cp,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void **pp_task_cb);
@@ -149,7 +150,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
* a new process.
*
* You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
* messing up the output of the other parallel processes.
*
* pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -159,7 +160,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
* To send a signal to other child processes for abortion, return
* the negative signal number.
*/
-typedef int (*start_failure_fn)(struct strbuf *err,
+typedef int (*start_failure_fn)(struct strbuf *out,
void *pp_cb,
void *pp_task_cb);
@@ -167,7 +168,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
* This callback is called on every child process that finished processing.
*
* You must not write to stdout or stderr in this function. Add your
- * message to the strbuf err instead, which will be printed without
+ * message to the strbuf out instead, which will be printed without
* messing up the output of the other parallel processes.
*
* pp_cb is the callback cookie as passed into run_processes_parallel,
@@ -178,7 +179,7 @@ typedef int (*start_failure_fn)(struct strbuf *err,
* the negative signal number.
*/
typedef int (*task_finished_fn)(int result,
- struct strbuf *err,
+ struct strbuf *out,
void *pp_cb,
void *pp_task_cb);
diff --git a/send-pack.c b/send-pack.c
index 047bd18..37ee04e 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -518,6 +518,7 @@ int send_pack(struct send_pack_args *args,
demux.proc = sideband_demux;
demux.data = fd;
demux.out = -1;
+ demux.isolate_sigpipe = 1;
if (start_async(&demux))
die("send-pack: unable to fork off sideband demultiplexer");
in = demux.out;
@@ -531,8 +532,10 @@ int send_pack(struct send_pack_args *args,
close(out);
if (git_connection_is_socket(conn))
shutdown(fd[0], SHUT_WR);
- if (use_sideband)
+ if (use_sideband) {
+ close(demux.out);
finish_async(&demux);
+ }
fd[1] = -1;
return -1;
}
@@ -551,11 +554,11 @@ int send_pack(struct send_pack_args *args,
packet_flush(out);
if (use_sideband && cmds_sent) {
+ close(demux.out);
if (finish_async(&demux)) {
error("error in sideband demultiplexer");
ret = -1;
}
- close(demux.out);
}
if (ret < 0)
diff --git a/sequencer.c b/sequencer.c
index e66f2fe..4687ad4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -875,8 +875,7 @@ static int sequencer_rollback(struct replay_opts *opts)
return rollback_single_pick();
}
if (!f)
- return error(_("cannot open %s: %s"), git_path_head_file(),
- strerror(errno));
+ return error_errno(_("cannot open %s"), git_path_head_file());
if (strbuf_getline_lf(&buf, f)) {
error(_("cannot read %s: %s"), git_path_head_file(),
ferror(f) ? strerror(errno) : _("unexpected end of file"));
diff --git a/server-info.c b/server-info.c
index 5a86e29..75dd677 100644
--- a/server-info.c
+++ b/server-info.c
@@ -36,7 +36,7 @@ static int update_info_file(char *path, int (*generate)(FILE *))
out:
if (ret) {
- error("unable to update %s: %s", path, strerror(errno));
+ error_errno("unable to update %s", path);
if (fp)
fclose(fp);
else if (fd >= 0)
diff --git a/setup.c b/setup.c
index de1a2a7..c86bf5c 100644
--- a/setup.c
+++ b/setup.c
@@ -5,7 +5,9 @@
static int inside_git_dir = -1;
static int inside_work_tree = -1;
static int work_tree_config_is_bogus;
-static struct string_list unknown_extensions = STRING_LIST_INIT_DUP;
+
+static struct startup_info the_startup_info;
+struct startup_info *startup_info = &the_startup_info;
/*
* The input parameter must contain an absolute path, and it must already be
@@ -100,7 +102,7 @@ char *prefix_path_gently(const char *prefix, int len,
return NULL;
}
} else {
- sanitized = xstrfmt("%.*s%s", len, prefix, path);
+ sanitized = xstrfmt("%.*s%s", len, len ? prefix : "", path);
if (remaining_prefix)
*remaining_prefix = len;
if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) {
@@ -370,14 +372,13 @@ void setup_work_tree(void)
initialized = 1;
}
-static int check_repo_format(const char *var, const char *value, void *cb)
+static int check_repo_format(const char *var, const char *value, void *vdata)
{
+ struct repository_format *data = vdata;
const char *ext;
if (strcmp(var, "core.repositoryformatversion") == 0)
- repository_format_version = git_config_int(var, value);
- else if (strcmp(var, "core.sharedrepository") == 0)
- shared_repository = git_config_perm(var, value);
+ data->version = git_config_int(var, value);
else if (skip_prefix(var, "extensions.", &ext)) {
/*
* record any known extensions here; otherwise,
@@ -387,9 +388,15 @@ static int check_repo_format(const char *var, const char *value, void *cb)
if (!strcmp(ext, "noop"))
;
else if (!strcmp(ext, "preciousobjects"))
- repository_format_precious_objects = git_config_bool(var, value);
+ data->precious_objects = git_config_bool(var, value);
else
- string_list_append(&unknown_extensions, ext);
+ string_list_append(&data->unknown_extensions, ext);
+ } else if (strcmp(var, "core.bare") == 0) {
+ data->is_bare = git_config_bool(var, value);
+ } else if (strcmp(var, "core.worktree") == 0) {
+ if (!value)
+ return config_error_nonbool(var);
+ data->work_tree = xstrdup(value);
}
return 0;
}
@@ -397,56 +404,84 @@ static int check_repo_format(const char *var, const char *value, void *cb)
static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
{
struct strbuf sb = STRBUF_INIT;
- const char *repo_config;
- config_fn_t fn;
- int ret = 0;
-
- string_list_clear(&unknown_extensions, 0);
+ struct strbuf err = STRBUF_INIT;
+ struct repository_format candidate;
+ int has_common;
- if (get_common_dir(&sb, gitdir))
- fn = check_repo_format;
- else
- fn = check_repository_format_version;
+ has_common = get_common_dir(&sb, gitdir);
strbuf_addstr(&sb, "/config");
- repo_config = sb.buf;
+ read_repository_format(&candidate, sb.buf);
+ strbuf_release(&sb);
/*
- * git_config() can't be used here because it calls git_pathdup()
- * to get $GIT_CONFIG/config. That call will make setup_git_env()
- * set git_dir to ".git".
- *
- * We are in gitdir setup, no git dir has been found useable yet.
- * Use a gentler version of git_config() to check if this repo
- * is a good one.
+ * For historical use of check_repository_format() in git-init,
+ * we treat a missing config as a silent "ok", even when nongit_ok
+ * is unset.
*/
- git_config_early(fn, NULL, repo_config);
- if (GIT_REPO_VERSION_READ < repository_format_version) {
- if (!nongit_ok)
- die ("Expected git repo version <= %d, found %d",
- GIT_REPO_VERSION_READ, repository_format_version);
- warning("Expected git repo version <= %d, found %d",
- GIT_REPO_VERSION_READ, repository_format_version);
- warning("Please upgrade Git");
- *nongit_ok = -1;
- ret = -1;
+ if (candidate.version < 0)
+ return 0;
+
+ if (verify_repository_format(&candidate, &err) < 0) {
+ if (nongit_ok) {
+ warning("%s", err.buf);
+ strbuf_release(&err);
+ *nongit_ok = -1;
+ return -1;
+ }
+ die("%s", err.buf);
}
- if (repository_format_version >= 1 && unknown_extensions.nr) {
+ repository_format_precious_objects = candidate.precious_objects;
+ string_list_clear(&candidate.unknown_extensions, 0);
+ if (!has_common) {
+ if (candidate.is_bare != -1) {
+ is_bare_repository_cfg = candidate.is_bare;
+ if (is_bare_repository_cfg == 1)
+ inside_work_tree = -1;
+ }
+ if (candidate.work_tree) {
+ free(git_work_tree_cfg);
+ git_work_tree_cfg = candidate.work_tree;
+ inside_work_tree = -1;
+ }
+ } else {
+ free(candidate.work_tree);
+ }
+
+ return 0;
+}
+
+int read_repository_format(struct repository_format *format, const char *path)
+{
+ memset(format, 0, sizeof(*format));
+ format->version = -1;
+ format->is_bare = -1;
+ string_list_init(&format->unknown_extensions, 1);
+ git_config_from_file(check_repo_format, path, format);
+ return format->version;
+}
+
+int verify_repository_format(const struct repository_format *format,
+ struct strbuf *err)
+{
+ if (GIT_REPO_VERSION_READ < format->version) {
+ strbuf_addf(err, _("Expected git repo version <= %d, found %d"),
+ GIT_REPO_VERSION_READ, format->version);
+ return -1;
+ }
+
+ if (format->version >= 1 && format->unknown_extensions.nr) {
int i;
- if (!nongit_ok)
- die("unknown repository extension: %s",
- unknown_extensions.items[0].string);
+ strbuf_addstr(err, _("unknown repository extensions found:"));
- for (i = 0; i < unknown_extensions.nr; i++)
- warning("unknown repository extension: %s",
- unknown_extensions.items[i].string);
- *nongit_ok = -1;
- ret = -1;
+ for (i = 0; i < format->unknown_extensions.nr; i++)
+ strbuf_addf(err, "\n\t%s",
+ format->unknown_extensions.items[i].string);
+ return -1;
}
- strbuf_release(&sb);
- return ret;
+ return 0;
}
/*
@@ -905,10 +940,9 @@ const char *setup_git_directory_gently(int *nongit_ok)
else
setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
- if (startup_info) {
- startup_info->have_repository = !nongit_ok || !*nongit_ok;
- startup_info->prefix = prefix;
- }
+ startup_info->have_repository = !nongit_ok || !*nongit_ok;
+ startup_info->prefix = prefix;
+
return prefix;
}
@@ -963,28 +997,10 @@ int git_config_perm(const char *var, const char *value)
return -(i & 0666);
}
-int check_repository_format_version(const char *var, const char *value, void *cb)
-{
- int ret = check_repo_format(var, value, cb);
- if (ret)
- return ret;
- if (strcmp(var, "core.bare") == 0) {
- is_bare_repository_cfg = git_config_bool(var, value);
- if (is_bare_repository_cfg == 1)
- inside_work_tree = -1;
- } else if (strcmp(var, "core.worktree") == 0) {
- if (!value)
- return config_error_nonbool(var);
- free(git_work_tree_cfg);
- git_work_tree_cfg = xstrdup(value);
- inside_work_tree = -1;
- }
- return 0;
-}
-
-int check_repository_format(void)
+void check_repository_format(void)
{
- return check_repository_format_gently(get_git_dir(), NULL);
+ check_repository_format_gently(get_git_dir(), NULL);
+ startup_info->have_repository = 1;
}
/*
diff --git a/sha1_file.c b/sha1_file.c
index d0f2aa0..d5e1121 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -301,7 +301,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base,
return -1;
}
}
- if (!strcmp_icase(ent->base, normalized_objdir)) {
+ if (!fspathcmp(ent->base, normalized_objdir)) {
free(ent);
return -1;
}
@@ -1107,9 +1107,8 @@ unsigned char *use_pack(struct packed_git *p,
PROT_READ, MAP_PRIVATE,
p->pack_fd, win->offset);
if (win->base == MAP_FAILED)
- die("packfile %s cannot be mapped: %s",
- p->pack_name,
- strerror(errno));
+ die_errno("packfile %s cannot be mapped",
+ p->pack_name);
if (!win->offset && win->len == p->pack_size
&& !p->do_not_close)
close_pack_fd(p);
@@ -1279,8 +1278,8 @@ static void prepare_packed_git_one(char *objdir, int local)
dir = opendir(path.buf);
if (!dir) {
if (errno != ENOENT)
- error("unable to open object pack directory: %s: %s",
- path.buf, strerror(errno));
+ error_errno("unable to open object pack directory: %s",
+ path.buf);
strbuf_release(&path);
return;
}
@@ -2984,7 +2983,7 @@ int finalize_object_file(const char *tmpfile, const char *filename)
unlink_or_warn(tmpfile);
if (ret) {
if (ret != EEXIST) {
- return error("unable to write sha1 filename %s: %s", filename, strerror(ret));
+ return error_errno("unable to write sha1 filename %s", filename);
}
/* FIXME!!! Collision check here ? */
}
@@ -2998,7 +2997,7 @@ out:
static int write_buffer(int fd, const void *buf, size_t len)
{
if (write_in_full(fd, buf, len) < 0)
- return error("file write error (%s)", strerror(errno));
+ return error_errno("file write error");
return 0;
}
@@ -3081,7 +3080,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
if (errno == EACCES)
return error("insufficient permission for adding an object to repository database %s", get_object_directory());
else
- return error("unable to create temporary file: %s", strerror(errno));
+ return error_errno("unable to create temporary file");
}
/* Set it up */
@@ -3126,8 +3125,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
utb.actime = mtime;
utb.modtime = mtime;
if (utime(tmp_file.buf, &utb) < 0)
- warning("failed utime() on %s: %s",
- tmp_file.buf, strerror(errno));
+ warning_errno("failed utime() on %s", tmp_file.buf);
}
return finalize_object_file(tmp_file.buf, filename);
@@ -3360,7 +3358,7 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
if (size == read_in_full(fd, buf, size))
ret = index_mem(sha1, buf, size, type, path, flags);
else
- ret = error("short read %s", strerror(errno));
+ ret = error_errno("short read");
free(buf);
} else {
void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -3425,18 +3423,14 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned
case S_IFREG:
fd = open(path, O_RDONLY);
if (fd < 0)
- return error("open(\"%s\"): %s", path,
- strerror(errno));
+ return error_errno("open(\"%s\")", path);
if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0)
return error("%s: failed to insert into database",
path);
break;
case S_IFLNK:
- if (strbuf_readlink(&sb, path, st->st_size)) {
- char *errstr = strerror(errno);
- return error("readlink(\"%s\"): %s", path,
- errstr);
- }
+ if (strbuf_readlink(&sb, path, st->st_size))
+ return error_errno("readlink(\"%s\")", path);
if (!(flags & HASH_WRITE_OBJECT))
hash_sha1_file(sb.buf, sb.len, blob_type, sha1);
else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1))
@@ -3492,7 +3486,7 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
if (!dir) {
if (errno == ENOENT)
return 0;
- return error("unable to open %s: %s", path->buf, strerror(errno));
+ return error_errno("unable to open %s", path->buf);
}
while ((de = readdir(dir))) {
diff --git a/sha1_name.c b/sha1_name.c
index 3acf221..ca7ddd6 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1215,6 +1215,15 @@ int get_sha1(const char *name, unsigned char *sha1)
}
/*
+ * This is like "get_sha1()", but for struct object_id.
+ */
+int get_oid(const char *name, struct object_id *oid)
+{
+ return get_sha1(name, oid->hash);
+}
+
+
+/*
* Many callers know that the user meant to name a commit-ish by
* syntactical positions where the object name appears. Calling this
* function allows the machinery to disambiguate shorter-than-unique
@@ -1353,9 +1362,6 @@ static char *resolve_relative_path(const char *rel)
if (!starts_with(rel, "./") && !starts_with(rel, "../"))
return NULL;
- if (!startup_info)
- die("BUG: startup_info struct is not initialized.");
-
if (!is_inside_work_tree())
die("relative path syntax can't be used outside working tree.");
diff --git a/split-index.c b/split-index.c
index 968b780..3c75d4b 100644
--- a/split-index.c
+++ b/split-index.c
@@ -60,7 +60,7 @@ static void mark_base_index_entries(struct index_state *base)
* To keep track of the shared entries between
* istate->base->cache[] and istate->cache[], base entry
* position is stored in each base entry. All positions start
- * from 1 instead of 0, which is resrved to say "this is a new
+ * from 1 instead of 0, which is reserved to say "this is a new
* entry".
*/
for (i = 0; i < base->cache_nr; i++)
diff --git a/strbuf.c b/strbuf.c
index f60e2ee..1ba600b 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -395,6 +395,12 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
return cnt;
}
+ssize_t strbuf_write(struct strbuf *sb, FILE *f)
+{
+ return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
+}
+
+
#define STRBUF_MAXLINK (2*PATH_MAX)
int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
@@ -481,9 +487,15 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)
if (errno == ENOMEM)
die("Out of memory, getdelim failed");
- /* Restore slopbuf that we moved out of the way before */
+ /*
+ * Restore strbuf invariants; if getdelim left us with a NULL pointer,
+ * we can just re-init, but otherwise we should make sure that our
+ * length is empty, and that the result is NUL-terminated.
+ */
if (!sb->buf)
strbuf_init(sb, 0);
+ else
+ strbuf_reset(sb);
return EOF;
}
#else
diff --git a/strbuf.h b/strbuf.h
index f72fd14..7987405 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -387,6 +387,12 @@ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint
extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
/**
+ * Write the whole content of the strbuf to the stream not stopping at
+ * NUL bytes.
+ */
+extern ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
+
+/**
* Read a line from a FILE *, overwriting the existing contents of
* the strbuf. The strbuf_getline*() family of functions share
* this signature, but have different line termination conventions.
diff --git a/string-list.c b/string-list.c
index 2a32a3f..62d2084 100644
--- a/string-list.c
+++ b/string-list.c
@@ -231,12 +231,12 @@ void string_list_sort(struct string_list *list)
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string)
{
- int i;
+ struct string_list_item *item;
compare_strings_fn cmp = list->cmp ? list->cmp : strcmp;
- for (i = 0; i < list->nr; i++)
- if (!cmp(string, list->items[i].string))
- return list->items + i;
+ for_each_string_list_item(item, list)
+ if (!cmp(string, item->string))
+ return item;
return NULL;
}
diff --git a/submodule-config.c b/submodule-config.c
index 92502b5..debab29 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -30,7 +30,7 @@ enum lookup_type {
lookup_path
};
-static struct submodule_cache cache;
+static struct submodule_cache the_submodule_cache;
static int is_cache_init;
static int config_path_cmp(const struct submodule_entry *a,
@@ -59,6 +59,7 @@ static void free_one_config(struct submodule_entry *entry)
{
free((void *) entry->config->path);
free((void *) entry->config->name);
+ free((void *) entry->config->update_strategy.command);
free(entry->config);
}
@@ -194,6 +195,8 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
submodule->path = NULL;
submodule->url = NULL;
+ submodule->update_strategy.type = SM_UPDATE_UNSPECIFIED;
+ submodule->update_strategy.command = NULL;
submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
submodule->ignore = NULL;
@@ -293,7 +296,7 @@ static int parse_config(const char *var, const char *value, void *data)
if (!strcmp(item.buf, "path")) {
if (!value)
ret = config_error_nonbool(var);
- else if (!me->overwrite && submodule->path != NULL)
+ else if (!me->overwrite && submodule->path)
warn_multiple_config(me->commit_sha1, submodule->name,
"path");
else {
@@ -317,7 +320,7 @@ static int parse_config(const char *var, const char *value, void *data)
} else if (!strcmp(item.buf, "ignore")) {
if (!value)
ret = config_error_nonbool(var);
- else if (!me->overwrite && submodule->ignore != NULL)
+ else if (!me->overwrite && submodule->ignore)
warn_multiple_config(me->commit_sha1, submodule->name,
"ignore");
else if (strcmp(value, "untracked") &&
@@ -333,13 +336,23 @@ static int parse_config(const char *var, const char *value, void *data)
} else if (!strcmp(item.buf, "url")) {
if (!value) {
ret = config_error_nonbool(var);
- } else if (!me->overwrite && submodule->url != NULL) {
+ } else if (!me->overwrite && submodule->url) {
warn_multiple_config(me->commit_sha1, submodule->name,
"url");
} else {
free((void *) submodule->url);
submodule->url = xstrdup(value);
}
+ } else if (!strcmp(item.buf, "update")) {
+ if (!value)
+ ret = config_error_nonbool(var);
+ else if (!me->overwrite &&
+ submodule->update_strategy.type != SM_UPDATE_UNSPECIFIED)
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "update");
+ else if (parse_submodule_update_strategy(value,
+ &submodule->update_strategy) < 0)
+ die(_("invalid value for %s"), var);
}
strbuf_release(&name);
@@ -392,8 +405,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
struct hashmap_iter iter;
struct submodule_entry *entry;
- hashmap_iter_init(&cache->for_name, &iter);
- entry = hashmap_iter_next(&iter);
+ entry = hashmap_iter_first(&cache->for_name, &iter);
if (!entry)
return NULL;
return entry->config;
@@ -458,14 +470,14 @@ static void ensure_cache_init(void)
if (is_cache_init)
return;
- cache_init(&cache);
+ cache_init(&the_submodule_cache);
is_cache_init = 1;
}
int parse_submodule_config_option(const char *var, const char *value)
{
struct parse_config_parameter parameter;
- parameter.cache = &cache;
+ parameter.cache = &the_submodule_cache;
parameter.commit_sha1 = NULL;
parameter.gitmodules_sha1 = null_sha1;
parameter.overwrite = 1;
@@ -478,18 +490,18 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
const char *name)
{
ensure_cache_init();
- return config_from_name(&cache, commit_sha1, name);
+ return config_from_name(&the_submodule_cache, commit_sha1, name);
}
const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
const char *path)
{
ensure_cache_init();
- return config_from_path(&cache, commit_sha1, path);
+ return config_from_path(&the_submodule_cache, commit_sha1, path);
}
void submodule_free(void)
{
- cache_free(&cache);
+ cache_free(&the_submodule_cache);
is_cache_init = 0;
}
diff --git a/submodule-config.h b/submodule-config.h
index 9bfa65a..e4857f5 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -2,6 +2,7 @@
#define SUBMODULE_CONFIG_CACHE_H
#include "hashmap.h"
+#include "submodule.h"
#include "strbuf.h"
/*
@@ -14,6 +15,7 @@ struct submodule {
const char *url;
int fetch_recurse;
const char *ignore;
+ struct submodule_update_strategy update_strategy;
/* the sha1 blob id of the responsible .gitmodules file */
unsigned char gitmodules_sha1[20];
};
diff --git a/submodule.c b/submodule.c
index 62c4356..4532b11 100644
--- a/submodule.c
+++ b/submodule.c
@@ -13,8 +13,10 @@
#include "argv-array.h"
#include "blob.h"
#include "thread-utils.h"
+#include "quote.h"
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
+static int parallel_jobs = 1;
static struct string_list changed_submodule_paths;
static int initialized_fetch_ref_tips;
static struct sha1_array ref_tips_before_fetch;
@@ -169,7 +171,12 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
int submodule_config(const char *var, const char *value, void *cb)
{
- if (starts_with(var, "submodule."))
+ if (!strcmp(var, "submodule.fetchjobs")) {
+ parallel_jobs = git_config_int(var, value);
+ if (parallel_jobs < 0)
+ die(_("negative values not allowed for submodule.fetchJobs"));
+ return 0;
+ } else if (starts_with(var, "submodule."))
return parse_submodule_config_option(var, value);
else if (!strcmp(var, "fetch.recursesubmodules")) {
config_fetch_recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
@@ -210,6 +217,48 @@ void gitmodules_config(void)
}
}
+int parse_submodule_update_strategy(const char *value,
+ struct submodule_update_strategy *dst)
+{
+ free((void*)dst->command);
+ dst->command = NULL;
+ if (!strcmp(value, "none"))
+ dst->type = SM_UPDATE_NONE;
+ else if (!strcmp(value, "checkout"))
+ dst->type = SM_UPDATE_CHECKOUT;
+ else if (!strcmp(value, "rebase"))
+ dst->type = SM_UPDATE_REBASE;
+ else if (!strcmp(value, "merge"))
+ dst->type = SM_UPDATE_MERGE;
+ else if (skip_prefix(value, "!", &value)) {
+ dst->type = SM_UPDATE_COMMAND;
+ dst->command = xstrdup(value);
+ } else
+ return -1;
+ return 0;
+}
+
+const char *submodule_strategy_to_string(const struct submodule_update_strategy *s)
+{
+ struct strbuf sb = STRBUF_INIT;
+ switch (s->type) {
+ case SM_UPDATE_CHECKOUT:
+ return "checkout";
+ case SM_UPDATE_MERGE:
+ return "merge";
+ case SM_UPDATE_REBASE:
+ return "rebase";
+ case SM_UPDATE_NONE:
+ return "none";
+ case SM_UPDATE_UNSPECIFIED:
+ return NULL;
+ case SM_UPDATE_COMMAND:
+ strbuf_addf(&sb, "!%s", s->command);
+ return strbuf_detach(&sb, NULL);
+ }
+ return NULL;
+}
+
void handle_ignore_submodules_arg(struct diff_options *diffopt,
const char *arg)
{
@@ -366,7 +415,7 @@ static int submodule_needs_pushing(const char *path, const unsigned char sha1[20
argv[1] = sha1_to_hex(sha1);
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -453,7 +502,7 @@ static int push_submodule(const char *path)
const char *argv[] = {"push", NULL};
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.dir = path;
@@ -499,7 +548,7 @@ static int is_submodule_commit_present(const char *path, unsigned char sha1[20])
argv[3] = sha1_to_hex(sha1);
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.dir = path;
@@ -682,7 +731,7 @@ static int get_next_submodule(struct child_process *cp,
if (is_directory(git_dir)) {
child_process_init(cp);
cp->dir = strbuf_detach(&submodule_path, NULL);
- cp->env = local_repo_env;
+ prepare_submodule_repo_env(&cp->env_array);
cp->git_cmd = 1;
if (!spf->quiet)
strbuf_addf(err, "Fetching submodule %s%s\n",
@@ -750,6 +799,9 @@ int fetch_populated_submodules(const struct argv_array *options,
argv_array_push(&spf.args, "--recurse-submodules-default");
/* default value, "--submodule-prefix" and its value are added later */
+ if (max_parallel_jobs < 0)
+ max_parallel_jobs = parallel_jobs;
+
calculate_changed_submodule_paths();
run_processes_parallel(max_parallel_jobs,
get_next_submodule,
@@ -794,7 +846,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
argv[2] = "-uno";
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -855,7 +907,7 @@ int submodule_uses_gitfile(const char *path)
/* Now test that all nested submodules use a gitfile too */
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.no_stderr = 1;
@@ -888,7 +940,7 @@ int ok_to_remove_submodule(const char *path)
return 0;
cp.argv = argv;
- cp.env = local_repo_env;
+ prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.out = -1;
@@ -1094,3 +1146,18 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)
strbuf_release(&rel_path);
free((void *)real_work_tree);
}
+
+int parallel_submodules(void)
+{
+ return parallel_jobs;
+}
+
+void prepare_submodule_repo_env(struct argv_array *out)
+{
+ const char * const *var;
+
+ for (var = local_repo_env; *var; var++) {
+ if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
+ argv_array_push(out, *var);
+ }
+}
diff --git a/submodule.h b/submodule.h
index e06eaa5..2af9390 100644
--- a/submodule.h
+++ b/submodule.h
@@ -14,6 +14,21 @@ enum {
RECURSE_SUBMODULES_ON = 2
};
+enum submodule_update_type {
+ SM_UPDATE_UNSPECIFIED = 0,
+ SM_UPDATE_CHECKOUT,
+ SM_UPDATE_REBASE,
+ SM_UPDATE_MERGE,
+ SM_UPDATE_NONE,
+ SM_UPDATE_COMMAND
+};
+
+struct submodule_update_strategy {
+ enum submodule_update_type type;
+ const char *command;
+};
+#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
+
int is_staging_gitmodules_ok(void);
int update_path_in_gitmodules(const char *oldpath, const char *newpath);
int remove_path_from_gitmodules(const char *path);
@@ -22,6 +37,9 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path);
int submodule_config(const char *var, const char *value, void *cb);
void gitmodules_config(void);
+int parse_submodule_update_strategy(const char *value,
+ struct submodule_update_strategy *dst);
+const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
void show_submodule_summary(FILE *f, const char *path,
const char *line_prefix,
@@ -42,5 +60,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_nam
struct string_list *needs_pushing);
int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+int parallel_submodules(void);
+
+/*
+ * Prepare the "env_array" parameter of a "struct child_process" for executing
+ * a submodule by clearing any repo-specific envirionment variables, but
+ * retaining any config in the environment.
+ */
+void prepare_submodule_repo_env(struct argv_array *out);
#endif
diff --git a/t/README b/t/README
index 1dc908e..76a0daa 100644
--- a/t/README
+++ b/t/README
@@ -84,9 +84,9 @@ appropriately before running "make".
-x::
Turn on shell tracing (i.e., `set -x`) during the tests
- themselves. Implies `--verbose`. Note that this can cause
- failures in some tests which redirect and test the
- output of shell functions. Use with caution.
+ themselves. Implies `--verbose`. Note that in non-bash shells,
+ this can cause failures in some tests which redirect and test
+ the output of shell functions. Use with caution.
-d::
--debug::
diff --git a/t/helper/.gitignore b/t/helper/.gitignore
new file mode 100644
index 0000000..d6e8b36
--- /dev/null
+++ b/t/helper/.gitignore
@@ -0,0 +1,33 @@
+/test-chmtime
+/test-ctype
+/test-config
+/test-date
+/test-delta
+/test-dump-cache-tree
+/test-dump-split-index
+/test-dump-untracked-cache
+/test-fake-ssh
+/test-scrap-cache-tree
+/test-genrandom
+/test-hashmap
+/test-index-version
+/test-line-buffer
+/test-match-trees
+/test-mergesort
+/test-mktemp
+/test-parse-options
+/test-path-utils
+/test-prio-queue
+/test-read-cache
+/test-regex
+/test-revision-walking
+/test-run-command
+/test-sha1
+/test-sha1-array
+/test-sigchain
+/test-string-list
+/test-submodule-config
+/test-subprocess
+/test-svn-fe
+/test-urlmatch-normalization
+/test-wildmatch
diff --git a/test-chmtime.c b/t/helper/test-chmtime.c
index dfe8a83..dfe8a83 100644
--- a/test-chmtime.c
+++ b/t/helper/test-chmtime.c
diff --git a/test-config.c b/t/helper/test-config.c
index 6a77552..6a77552 100644
--- a/test-config.c
+++ b/t/helper/test-config.c
diff --git a/test-ctype.c b/t/helper/test-ctype.c
index 707a821..707a821 100644
--- a/test-ctype.c
+++ b/t/helper/test-ctype.c
diff --git a/test-date.c b/t/helper/test-date.c
index 63f3735..63f3735 100644
--- a/test-date.c
+++ b/t/helper/test-date.c
diff --git a/test-delta.c b/t/helper/test-delta.c
index 4595cd6..4595cd6 100644
--- a/test-delta.c
+++ b/t/helper/test-delta.c
diff --git a/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index bb53c0a..bb53c0a 100644
--- a/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
diff --git a/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 861d28c..861d28c 100644
--- a/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
diff --git a/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index 0a1c285..0a1c285 100644
--- a/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
diff --git a/test-fake-ssh.c b/t/helper/test-fake-ssh.c
index 980de21..980de21 100644
--- a/test-fake-ssh.c
+++ b/t/helper/test-fake-ssh.c
diff --git a/test-genrandom.c b/t/helper/test-genrandom.c
index 54824d0..54824d0 100644
--- a/test-genrandom.c
+++ b/t/helper/test-genrandom.c
diff --git a/test-hashmap.c b/t/helper/test-hashmap.c
index cc2891d..cc2891d 100644
--- a/test-hashmap.c
+++ b/t/helper/test-hashmap.c
diff --git a/test-index-version.c b/t/helper/test-index-version.c
index 05d4699..05d4699 100644
--- a/test-index-version.c
+++ b/t/helper/test-index-version.c
diff --git a/test-line-buffer.c b/t/helper/test-line-buffer.c
index 1e58f04..1e58f04 100644
--- a/test-line-buffer.c
+++ b/t/helper/test-line-buffer.c
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
new file mode 100644
index 0000000..d446b8e
--- /dev/null
+++ b/t/helper/test-match-trees.c
@@ -0,0 +1,26 @@
+#include "cache.h"
+#include "tree.h"
+
+int main(int ac, char **av)
+{
+ struct object_id hash1, hash2, shifted;
+ struct tree *one, *two;
+
+ setup_git_directory();
+
+ if (get_oid(av[1], &hash1))
+ die("cannot parse %s as an object name", av[1]);
+ if (get_oid(av[2], &hash2))
+ die("cannot parse %s as an object name", av[2]);
+ one = parse_tree_indirect(hash1.hash);
+ if (!one)
+ die("not a tree-ish %s", av[1]);
+ two = parse_tree_indirect(hash2.hash);
+ if (!two)
+ die("not a tree-ish %s", av[2]);
+
+ shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
+ printf("shifted: %s\n", oid_to_hex(&shifted));
+
+ exit(0);
+}
diff --git a/test-mergesort.c b/t/helper/test-mergesort.c
index ea3b959..ea3b959 100644
--- a/test-mergesort.c
+++ b/t/helper/test-mergesort.c
diff --git a/test-mktemp.c b/t/helper/test-mktemp.c
index c8c5421..c8c5421 100644
--- a/test-mktemp.c
+++ b/t/helper/test-mktemp.c
diff --git a/test-parse-options.c b/t/helper/test-parse-options.c
index 2c8c8f1..8a1235d 100644
--- a/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -7,16 +7,25 @@ static int integer = 0;
static unsigned long magnitude = 0;
static unsigned long timestamp;
static int abbrev = 7;
-static int verbose = 0, dry_run = 0, quiet = 0;
+static int verbose = -1; /* unspecified */
+static int dry_run = 0, quiet = 0;
static char *string = NULL;
static char *file = NULL;
static int ambiguous;
static struct string_list list;
+static struct {
+ int called;
+ const char *arg;
+ int unset;
+} length_cb;
+
static int length_callback(const struct option *opt, const char *arg, int unset)
{
- printf("Callback: \"%s\", %d\n",
- (arg ? arg : "not set"), unset);
+ length_cb.called = 1;
+ length_cb.arg = arg;
+ length_cb.unset = unset;
+
if (unset)
return 1; /* do not support unset */
@@ -30,6 +39,61 @@ static int number_callback(const struct option *opt, const char *arg, int unset)
return 0;
}
+static int collect_expect(const struct option *opt, const char *arg, int unset)
+{
+ struct string_list *expect;
+ struct string_list_item *item;
+ struct strbuf label = STRBUF_INIT;
+ const char *colon;
+
+ if (!arg || unset)
+ die("malformed --expect option");
+
+ expect = (struct string_list *)opt->value;
+ colon = strchr(arg, ':');
+ if (!colon)
+ die("malformed --expect option, lacking a colon");
+ strbuf_add(&label, arg, colon - arg);
+ item = string_list_insert(expect, strbuf_detach(&label, NULL));
+ if (item->util)
+ die("malformed --expect option, duplicate %s", label.buf);
+ item->util = (void *)arg;
+ return 0;
+}
+
+__attribute__((format (printf,3,4)))
+static void show(struct string_list *expect, int *status, const char *fmt, ...)
+{
+ struct string_list_item *item;
+ struct strbuf buf = STRBUF_INIT;
+ va_list args;
+
+ va_start(args, fmt);
+ strbuf_vaddf(&buf, fmt, args);
+ va_end(args);
+
+ if (!expect->nr)
+ printf("%s\n", buf.buf);
+ else {
+ char *colon = strchr(buf.buf, ':');
+ if (!colon)
+ die("malformed output format, output lacking colon: %s", fmt);
+ *colon = '\0';
+ item = string_list_lookup(expect, buf.buf);
+ *colon = ':';
+ if (!item)
+ ; /* not among entries being checked */
+ else {
+ if (strcmp((const char *)item->util, buf.buf)) {
+ printf("-%s\n", (char *)item->util);
+ printf("+%s\n", buf.buf);
+ *status = 1;
+ }
+ }
+ }
+ strbuf_release(&buf);
+}
+
int main(int argc, char **argv)
{
const char *prefix = "prefix/";
@@ -37,6 +101,7 @@ int main(int argc, char **argv)
"test-parse-options <options>",
NULL
};
+ struct string_list expect = STRING_LIST_INIT_NODUP;
struct option options[] = {
OPT_BOOL(0, "yes", &boolean, "get a boolean"),
OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -77,28 +142,38 @@ int main(int argc, char **argv)
OPT__VERBOSE(&verbose, "be verbose"),
OPT__DRY_RUN(&dry_run, "dry run"),
OPT__QUIET(&quiet, "be quiet"),
+ OPT_CALLBACK(0, "expect", &expect, "string",
+ "expected output in the variable dump",
+ collect_expect),
OPT_END(),
};
int i;
+ int ret = 0;
argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
- printf("boolean: %d\n", boolean);
- printf("integer: %d\n", integer);
- printf("magnitude: %lu\n", magnitude);
- printf("timestamp: %lu\n", timestamp);
- printf("string: %s\n", string ? string : "(not set)");
- printf("abbrev: %d\n", abbrev);
- printf("verbose: %d\n", verbose);
- printf("quiet: %s\n", quiet ? "yes" : "no");
- printf("dry run: %s\n", dry_run ? "yes" : "no");
- printf("file: %s\n", file ? file : "(not set)");
+ if (length_cb.called) {
+ const char *arg = length_cb.arg;
+ int unset = length_cb.unset;
+ show(&expect, &ret, "Callback: \"%s\", %d",
+ (arg ? arg : "not set"), unset);
+ }
+ show(&expect, &ret, "boolean: %d", boolean);
+ show(&expect, &ret, "integer: %d", integer);
+ show(&expect, &ret, "magnitude: %lu", magnitude);
+ show(&expect, &ret, "timestamp: %lu", timestamp);
+ show(&expect, &ret, "string: %s", string ? string : "(not set)");
+ show(&expect, &ret, "abbrev: %d", abbrev);
+ show(&expect, &ret, "verbose: %d", verbose);
+ show(&expect, &ret, "quiet: %d", quiet);
+ show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no");
+ show(&expect, &ret, "file: %s", file ? file : "(not set)");
for (i = 0; i < list.nr; i++)
- printf("list: %s\n", list.items[i].string);
+ show(&expect, &ret, "list: %s", list.items[i].string);
for (i = 0; i < argc; i++)
- printf("arg %02d: %s\n", i, argv[i]);
+ show(&expect, &ret, "arg %02d: %s", i, argv[i]);
- return 0;
+ return ret;
}
diff --git a/test-path-utils.c b/t/helper/test-path-utils.c
index ba805b3..ba805b3 100644
--- a/test-path-utils.c
+++ b/t/helper/test-path-utils.c
diff --git a/test-prio-queue.c b/t/helper/test-prio-queue.c
index 7be72f0..7be72f0 100644
--- a/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
diff --git a/test-read-cache.c b/t/helper/test-read-cache.c
index b25bcf1..b25bcf1 100644
--- a/test-read-cache.c
+++ b/t/helper/test-read-cache.c
diff --git a/test-regex.c b/t/helper/test-regex.c
index 0dc598e..0dc598e 100644
--- a/test-regex.c
+++ b/t/helper/test-regex.c
diff --git a/test-revision-walking.c b/t/helper/test-revision-walking.c
index 285f06b..3d03133 100644
--- a/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -50,6 +50,8 @@ int main(int argc, char **argv)
if (argc < 2)
return 1;
+ setup_git_directory();
+
if (!strcmp(argv[1], "run-twice")) {
printf("1st\n");
if (!run_revision_walk())
diff --git a/test-run-command.c b/t/helper/test-run-command.c
index 30a64a9..30a64a9 100644
--- a/test-run-command.c
+++ b/t/helper/test-run-command.c
diff --git a/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 6efee31..6efee31 100644
--- a/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
diff --git a/test-sha1-array.c b/t/helper/test-sha1-array.c
index 60ea1d5..60ea1d5 100644
--- a/test-sha1-array.c
+++ b/t/helper/test-sha1-array.c
diff --git a/test-sha1.c b/t/helper/test-sha1.c
index e57eae1..e57eae1 100644
--- a/test-sha1.c
+++ b/t/helper/test-sha1.c
diff --git a/test-sha1.sh b/t/helper/test-sha1.sh
index cef4bcc..750b95a 100755
--- a/test-sha1.sh
+++ b/t/helper/test-sha1.sh
@@ -1,7 +1,7 @@
#!/bin/sh
dd if=/dev/zero bs=1048576 count=100 2>/dev/null |
-/usr/bin/time ./test-sha1 >/dev/null
+/usr/bin/time t/helper/test-sha1 >/dev/null
while read expect cnt pfx
do
@@ -11,7 +11,7 @@ do
test -z "$pfx" || echo "$pfx"
dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
perl -pe 'y/\000/g/'
- } | ./test-sha1 $cnt
+ } | ./t/helper/test-sha1 $cnt
)
if test "$expect" = "$actual"
then
diff --git a/test-sigchain.c b/t/helper/test-sigchain.c
index e499fce..e499fce 100644
--- a/test-sigchain.c
+++ b/t/helper/test-sigchain.c
diff --git a/test-string-list.c b/t/helper/test-string-list.c
index 14bdf9d..14bdf9d 100644
--- a/test-string-list.c
+++ b/t/helper/test-string-list.c
diff --git a/test-submodule-config.c b/t/helper/test-submodule-config.c
index dab8c27..dab8c27 100644
--- a/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
diff --git a/test-subprocess.c b/t/helper/test-subprocess.c
index 56881a0..56881a0 100644
--- a/test-subprocess.c
+++ b/t/helper/test-subprocess.c
diff --git a/test-svn-fe.c b/t/helper/test-svn-fe.c
index 120ec96..120ec96 100644
--- a/test-svn-fe.c
+++ b/t/helper/test-svn-fe.c
diff --git a/test-urlmatch-normalization.c b/t/helper/test-urlmatch-normalization.c
index 090bf21..090bf21 100644
--- a/test-urlmatch-normalization.c
+++ b/t/helper/test-urlmatch-normalization.c
diff --git a/test-wildmatch.c b/t/helper/test-wildmatch.c
index 578b164..578b164 100644
--- a/test-wildmatch.c
+++ b/t/helper/test-wildmatch.c
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index f9ae1d7..54fd5a6 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -33,7 +33,7 @@ fi
# Older versions of perforce were available compiled natively for
# cygwin. Those do not accept native windows paths, so make sure
# not to convert for them.
-native_path() {
+native_path () {
path="$1" &&
if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN
then
@@ -49,8 +49,8 @@ native_path() {
# Attention: This function is not safe again against time offset updates
# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
# function could fix that but it is not in Python until 3.3.
-time_in_seconds() {
- python -c 'import time; print int(time.time())'
+time_in_seconds () {
+ (cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))')
}
# Try to pick a unique port: guess a large number, then hope
@@ -75,7 +75,7 @@ git="$TRASH_DIRECTORY/git"
pidfile="$TRASH_DIRECTORY/p4d.pid"
# Sometimes "prove" seems to hang on exit because p4d is still running
-cleanup() {
+cleanup () {
if test -f "$pidfile"
then
kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
@@ -89,7 +89,7 @@ trap cleanup EXIT
TMPDIR="$TRASH_DIRECTORY"
export TMPDIR
-start_p4d() {
+start_p4d () {
mkdir -p "$db" "$cli" "$git" &&
rm -f "$pidfile" &&
(
@@ -151,7 +151,7 @@ start_p4d() {
return 0
}
-p4_add_user() {
+p4_add_user () {
name=$1 &&
p4 user -f -i <<-EOF
User: $name
@@ -160,7 +160,16 @@ p4_add_user() {
EOF
}
-retry_until_success() {
+p4_add_job () {
+ p4 job -f -i <<-EOF
+ Job: $1
+ Status: open
+ User: dummy
+ Description:
+ EOF
+}
+
+retry_until_success () {
timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
do
@@ -168,7 +177,7 @@ retry_until_success() {
done
}
-retry_until_fail() {
+retry_until_fail () {
timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
do
@@ -176,7 +185,7 @@ retry_until_fail() {
done
}
-kill_p4d() {
+kill_p4d () {
pid=$(cat "$pidfile")
retry_until_fail kill $pid
retry_until_fail kill -9 $pid
@@ -186,21 +195,22 @@ kill_p4d() {
retry_until_fail kill -9 $watchdog_pid
}
-cleanup_git() {
+cleanup_git () {
retry_until_success rm -r "$git"
test_must_fail test -d "$git" &&
retry_until_success mkdir "$git"
}
-marshal_dump() {
+marshal_dump () {
what=$1 &&
line=${2:-1} &&
cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF &&
import marshal
import sys
+ instream = getattr(sys.stdin, 'buffer', sys.stdin)
for i in range($line):
- d = marshal.load(sys.stdin)
- print d['$what']
+ d = marshal.load(instream)
+ print(d[b'$what'].decode('utf-8'))
EOF
"$PYTHON_PATH" "$TRASH_DIRECTORY/marshal-dump.py"
}
@@ -208,7 +218,7 @@ marshal_dump() {
#
# Construct a client with this list of View lines
#
-client_view() {
+client_view () {
(
cat <<-EOF &&
Client: $P4CLIENT
@@ -222,7 +232,7 @@ client_view() {
) | p4 client -i
}
-is_cli_file_writeable() {
+is_cli_file_writeable () {
# cygwin version of p4 does not set read-only attr,
# will be marked 444 but -w is true
file="$1" &&
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 6a50b87..fb88232 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -1,8 +1,5 @@
. ./test-lib.sh
-remotes_git_svn=remotes/git""-svn
-git_svn_id=git""-svn-id
-
if test -n "$NO_SVN_TESTS"
then
skip_all='skipping git svn tests, NO_SVN_TESTS defined'
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index db2ef22..ec2aa8f 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -1,9 +1,8 @@
#!/bin/sh
gpg_version=$(gpg --version 2>&1)
-if test $? = 127; then
- say "You do not seem to have gpg installed"
-else
+if test $? != 127
+then
# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
# the gpg version 1.0.6 didn't parse trust packets correctly, so for
# that version, creation of signed tags using the generated key fails.
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index f667e7c..018a83a 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -74,6 +74,7 @@ PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
PassEnv ASAN_OPTIONS
PassEnv GIT_TRACE
+PassEnv GIT_CONFIG_NOSYSTEM
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/
@@ -101,6 +102,10 @@ Alias /auth/dumb/ www/auth/dumb/
SetEnv GIT_HTTP_EXPORT_ALL
Header set Set-Cookie name=value
</LocationMatch>
+<LocationMatch /smart_headers/>
+ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+ SetEnv GIT_HTTP_EXPORT_ALL
+</LocationMatch>
ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
ScriptAlias /broken_smart/ broken-smart-http.sh/
ScriptAlias /error/ error.sh/
@@ -127,6 +132,18 @@ RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 [R=302]
RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302]
RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302]
+# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond.
+# And as RewriteCond does not allow testing for non-matches, we match
+# the desired case first (one has abra, two has cadabra), and let it
+# pass by marking the RewriteRule as [L], "last rule, do not process
+# any other matching RewriteRules after this"), and then have another
+# RewriteRule that matches all other cases and lets them fail via '[F]',
+# "fail the request".
+RewriteCond %{HTTP:x-magic-one} =abra
+RewriteCond %{HTTP:x-magic-two} =cadabra
+RewriteRule ^/smart_headers/.* - [L]
+RewriteRule ^/smart_headers/.* - [F]
+
<IfDefine SSL>
LoadModule ssl_module modules/mod_ssl.so
diff --git a/t/perf/p3404-rebase-interactive.sh b/t/perf/p3404-rebase-interactive.sh
new file mode 100755
index 0000000..88f47de
--- /dev/null
+++ b/t/perf/p3404-rebase-interactive.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='Tests rebase -i performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# This commit merges a sufficiently long topic branch for reasonable
+# performance testing
+branch_merge=ba5312da19c6fdb6c6747d479f58932aae6e900c^{commit}
+export branch_merge
+
+git rev-parse --verify $branch_merge >/dev/null 2>&1 || {
+ skip_all='skipping because $branch_merge was not found'
+ test_done
+}
+
+write_script swap-first-two.sh <<\EOF
+case "$1" in
+*/COMMIT_EDITMSG)
+ mv "$1" "$1".bak &&
+ sed -e '1{h;d}' -e 2G <"$1".bak >"$1"
+ ;;
+esac
+EOF
+
+test_expect_success 'setup' '
+ git config core.editor "\"$PWD"/swap-first-two.sh\" &&
+ git checkout -f $branch_merge^2
+'
+
+test_perf 'rebase -i' '
+ git rebase -i $branch_merge^
+'
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 5cf74ed..18c363e 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -80,23 +80,29 @@ test_perf_create_repo_from () {
error "bug in the test script: not 2 parameters to test-create-repo"
repo="$1"
source="$2"
- source_git=$source/$(cd "$source" && git rev-parse --git-dir)
+ source_git="$(git -C "$source" rev-parse --git-dir)"
+ objects_dir="$(git -C "$source" rev-parse --git-path objects)"
mkdir -p "$repo/.git"
(
- cd "$repo/.git" &&
- { cp -Rl "$source_git/objects" . 2>/dev/null ||
- cp -R "$source_git/objects" .; } &&
+ cd "$source" &&
+ { cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
+ cp -R "$objects_dir" "$repo/.git/"; } &&
for stuff in "$source_git"/*; do
case "$stuff" in
- */objects|*/hooks|*/config)
+ */objects|*/hooks|*/config|*/commondir)
;;
*)
- cp -R "$stuff" . || exit 1
+ cp -R "$stuff" "$repo/.git/" || exit 1
;;
esac
- done &&
- cd .. &&
- git init -q &&
+ done
+ ) &&
+ (
+ cd "$repo" &&
+ git init -q && {
+ test_have_prereq SYMLINKS ||
+ git config core.symlinks false
+ } &&
mv .git/hooks .git/hooks-disabled 2>/dev/null
) || error "failed to copy repository '$source' to '$repo'"
}
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 79b9074..60811a3 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -98,7 +98,7 @@ check_sub_test_lib_test () {
}
check_sub_test_lib_test_err () {
- name="$1" # stdin is the expected output output from the test
+ name="$1" # stdin is the expected output from the test
# expected error output is in descriptior 3
(
cd "$name" &&
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index a5b9e7a..a6fdd5e 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -354,4 +354,34 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
test_path_is_dir realgitdir/refs
'
+# Tests for the hidden file attribute on windows
+is_hidden () {
+ # Use the output of `attrib`, ignore the absolute path
+ case "$(attrib "$1")" in *H*?:*) return 0;; esac
+ return 1
+}
+
+test_expect_success MINGW '.git hidden' '
+ rm -rf newdir &&
+ (
+ unset GIT_DIR GIT_WORK_TREE
+ mkdir newdir &&
+ cd newdir &&
+ git init &&
+ is_hidden .git
+ ) &&
+ check_config newdir/.git false unset
+'
+
+test_expect_success MINGW 'bare git dir not hidden' '
+ rm -rf newdir &&
+ (
+ unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
+ mkdir newdir &&
+ cd newdir &&
+ git --bare init
+ ) &&
+ ! is_hidden newdir
+'
+
test_done
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 89544dd..b425f3a 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -605,7 +605,7 @@ cat <<-EOF >expected-verbose
a/b/.gitignore:8:!on* a/b/one
a/b/.gitignore:8:!on* a/b/one one
a/b/.gitignore:8:!on* a/b/one two
- a/b/.gitignore:8:!on* "a/b/one\"three"
+ a/b/.gitignore:8:!on* "a/b/one\\"three"
a/b/.gitignore:9:!two a/b/two
a/.gitignore:1:two* a/b/twooo
$global_excludes:2:!globaltwo globaltwo
@@ -686,7 +686,7 @@ cat <<-EOF >expected-all
a/b/.gitignore:8:!on* b/one
a/b/.gitignore:8:!on* b/one one
a/b/.gitignore:8:!on* b/one two
- a/b/.gitignore:8:!on* "b/one\"three"
+ a/b/.gitignore:8:!on* "b/one\\"three"
a/b/.gitignore:9:!two b/two
:: b/not-ignored
a/.gitignore:1:two* b/twooo
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index f33962b..9372589 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -12,7 +12,7 @@ fi
compare_files () {
tr '\015\000' QN <"$1" >"$1".expect &&
- tr '\015\000' QN <"$2" >"$2".actual &&
+ tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual &&
test_cmp "$1".expect "$2".actual &&
rm "$1".expect "$2".actual
}
@@ -52,14 +52,17 @@ create_gitattributes () {
create_NNO_files () {
for crlf in false true input
do
- for attr in "" auto text -text lf crlf
+ for attr in "" auto text -text
do
- pfx=NNO_${crlf}_attr_${attr} &&
- cp CRLF_mix_LF ${pfx}_LF.txt &&
- cp CRLF_mix_LF ${pfx}_CRLF.txt &&
- cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt &&
- cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt &&
- cp CRLF_mix_LF ${pfx}_CRLF_nul.txt
+ for aeol in "" lf crlf
+ do
+ pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf}
+ cp CRLF_mix_LF ${pfx}_LF.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt &&
+ cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF_nul.txt
+ done
done
done
}
@@ -100,20 +103,22 @@ commit_check_warn () {
}
commit_chk_wrnNNO () {
- crlf=$1
- attr=$2
- lfwarn=$3
- crlfwarn=$4
- lfmixcrlf=$5
- lfmixcr=$6
- crlfnul=$7
- pfx=NNO_${crlf}_attr_${attr}
+ attr=$1 ; shift
+ aeol=$1 ; shift
+ crlf=$1 ; shift
+ lfwarn=$1 ; shift
+ crlfwarn=$1 ; shift
+ lfmixcrlf=$1 ; shift
+ lfmixcr=$1 ; shift
+ crlfnul=$1 ; shift
+ pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf}
#Commit files on top of existing file
- create_gitattributes "$attr" &&
+ create_gitattributes "$attr" $aeol &&
for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
do
fname=${pfx}_$f.txt &&
cp $f $fname &&
+ printf Z >>"$fname" &&
git -c core.autocrlf=$crlf add $fname 2>/dev/null &&
git -c core.autocrlf=$crlf commit -m "commit_$fname" $fname >"${pfx}_$f.err" 2>&1
done
@@ -121,19 +126,19 @@ commit_chk_wrnNNO () {
test_expect_success "commit NNO files crlf=$crlf attr=$attr LF" '
check_warning "$lfwarn" ${pfx}_LF.err
'
- test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF" '
+ test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF" '
check_warning "$crlfwarn" ${pfx}_CRLF.err
'
- test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF_mix_LF" '
+ test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF_mix_LF" '
check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
'
- test_expect_success "commit NNO files crlf=$crlf attr=$attr LF_mix_cr" '
+ test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf LF_mix_cr" '
check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
'
- test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF_nul" '
+ test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF_nul" '
check_warning "$crlfnul" ${pfx}_CRLF_nul.err
'
}
@@ -162,6 +167,7 @@ stats_ascii () {
# contruct the attr/ returned by git ls-files --eol
# Take none (=empty), one or two args
+# convert.c: eol=XX overrides text=auto
attr_ascii () {
case $1,$2 in
-text,*) echo "-text" ;;
@@ -169,8 +175,8 @@ attr_ascii () {
text,lf) echo "text eol=lf" ;;
text,crlf) echo "text eol=crlf" ;;
auto,) echo "text=auto" ;;
- auto,lf) echo "text=auto eol=lf" ;;
- auto,crlf) echo "text=auto eol=crlf" ;;
+ auto,lf) echo "text eol=lf" ;;
+ auto,crlf) echo "text eol=crlf" ;;
lf,) echo "text eol=lf" ;;
crlf,) echo "text eol=crlf" ;;
,) echo "" ;;
@@ -195,28 +201,29 @@ check_files_in_repo () {
}
check_in_repo_NNO () {
- crlf=$1
- attr=$2
- lfname=$3
- crlfname=$4
- lfmixcrlf=$5
- lfmixcr=$6
- crlfnul=$7
- pfx=NNO_${crlf}_attr_${attr}_
- test_expect_success "compare_files $lfname ${pfx}LF.txt" '
- compare_files $lfname ${pfx}LF.txt
+ attr=$1 ; shift
+ aeol=$1 ; shift
+ crlf=$1 ; shift
+ lfname=$1 ; shift
+ crlfname=$1 ; shift
+ lfmixcrlf=$1 ; shift
+ lfmixcr=$1 ; shift
+ crlfnul=$1 ; shift
+ pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf}
+ test_expect_success "compare_files $lfname ${pfx}_LF.txt" '
+ compare_files $lfname ${pfx}_LF.txt
'
- test_expect_success "compare_files $crlfname ${pfx}CRLF.txt" '
- compare_files $crlfname ${pfx}CRLF.txt
+ test_expect_success "compare_files $crlfname ${pfx}_CRLF.txt" '
+ compare_files $crlfname ${pfx}_CRLF.txt
'
- test_expect_success "compare_files $lfmixcrlf ${pfx}CRLF_mix_LF.txt" '
- compare_files $lfmixcrlf ${pfx}CRLF_mix_LF.txt
+ test_expect_success "compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt" '
+ compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
'
- test_expect_success "compare_files $lfmixcr ${pfx}LF_mix_CR.txt" '
- compare_files $lfmixcr ${pfx}LF_mix_CR.txt
+ test_expect_success "compare_files $lfmixcr ${pfx}_LF_mix_CR.txt" '
+ compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
'
- test_expect_success "compare_files $crlfnul ${pfx}CRLF_nul.txt" '
- compare_files $crlfnul ${pfx}CRLF_nul.txt
+ test_expect_success "compare_files $crlfnul ${pfx}_CRLF_nul.txt" '
+ compare_files $crlfnul ${pfx}_CRLF_nul.txt
'
}
@@ -231,7 +238,7 @@ checkout_files () {
lfmixcrlf=$1 ; shift
lfmixcr=$1 ; shift
crlfnul=$1 ; shift
- create_gitattributes "$attr" "$ident" &&
+ create_gitattributes "$attr" $ident $aeol &&
git config core.autocrlf $crlf &&
pfx=eol_${ceol}_crlf_${crlf}_attr_${attr}_ &&
for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul
@@ -244,7 +251,7 @@ checkout_files () {
fi
done
- test_expect_success "ls-files --eol attr=$attr $ident $aeol core.autocrlf=$crlf core.eol=$ceol" '
+ test_expect_success "ls-files --eol attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol" '
test_when_finished "rm expect actual" &&
sort <<-EOF >expect &&
i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -259,19 +266,19 @@ checkout_files () {
sort >actual &&
test_cmp expect actual
'
- test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF" "
+ test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF" "
compare_ws_file $pfx $lfname crlf_false_attr__LF.txt
"
- test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF" "
+ test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF" "
compare_ws_file $pfx $crlfname crlf_false_attr__CRLF.txt
"
- test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF_mix_LF" "
+ test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF_mix_LF" "
compare_ws_file $pfx $lfmixcrlf crlf_false_attr__CRLF_mix_LF.txt
"
- test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF_mix_CR" "
+ test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF_mix_CR" "
compare_ws_file $pfx $lfmixcr crlf_false_attr__LF_mix_CR.txt
"
- test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF_nul" "
+ test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF_nul" "
compare_ws_file $pfx $crlfnul crlf_false_attr__LF_nul.txt
"
}
@@ -385,31 +392,31 @@ test_expect_success 'commit files attr=crlf' '
commit_check_warn input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
'
-# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL
-commit_chk_wrnNNO false "" "" "" "" "" ""
-commit_chk_wrnNNO true "" "LF_CRLF" "" "" "" ""
-commit_chk_wrnNNO input "" "" "" "" "" ""
-
+# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL
+commit_chk_wrnNNO "" "" false "" "" "" "" ""
+commit_chk_wrnNNO "" "" true LF_CRLF "" "" "" ""
+commit_chk_wrnNNO "" "" input "" "" "" "" ""
-commit_chk_wrnNNO false "auto" "$WILC" "$WICL" "$WAMIX" "" ""
-commit_chk_wrnNNO true "auto" "LF_CRLF" "" "LF_CRLF" "" ""
-commit_chk_wrnNNO input "auto" "" "CRLF_LF" "CRLF_LF" "" ""
+commit_chk_wrnNNO "auto" "" false "$WILC" "$WICL" "$WAMIX" "" ""
+commit_chk_wrnNNO "auto" "" true LF_CRLF "" LF_CRLF "" ""
+commit_chk_wrnNNO "auto" "" input "" CRLF_LF CRLF_LF "" ""
-commit_chk_wrnNNO false "text" "$WILC" "$WICL" "$WAMIX" "$WILC" "$WICL"
-commit_chk_wrnNNO true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
-commit_chk_wrnNNO input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
-
-commit_chk_wrnNNO false "-text" "" "" "" "" ""
-commit_chk_wrnNNO true "-text" "" "" "" "" ""
-commit_chk_wrnNNO input "-text" "" "" "" "" ""
-
-commit_chk_wrnNNO false "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
-commit_chk_wrnNNO true "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
-commit_chk_wrnNNO input "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF"
+for crlf in true false input
+do
+ commit_chk_wrnNNO -text "" $crlf "" "" "" "" ""
+ commit_chk_wrnNNO -text lf $crlf "" "" "" "" ""
+ commit_chk_wrnNNO -text crlf $crlf "" "" "" "" ""
+ commit_chk_wrnNNO "" lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF
+ commit_chk_wrnNNO "" crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF ""
+ commit_chk_wrnNNO auto lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF
+ commit_chk_wrnNNO auto crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF ""
+ commit_chk_wrnNNO text lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF
+ commit_chk_wrnNNO text crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF ""
+done
-commit_chk_wrnNNO false "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
-commit_chk_wrnNNO true "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
-commit_chk_wrnNNO input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
+commit_chk_wrnNNO "text" "" false "$WILC" "$WICL" "$WAMIX" "$WILC" "$WICL"
+commit_chk_wrnNNO "text" "" true LF_CRLF "" LF_CRLF LF_CRLF ""
+commit_chk_wrnNNO "text" "" input "" CRLF_LF CRLF_LF "" CRLF_LF
test_expect_success 'create files cleanup' '
rm -f *.txt &&
@@ -440,24 +447,20 @@ test_expect_success 'commit -text' '
check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
'
-# attr LF CRLF CRLF_mix_LF LF_mix_CR CRLFNUL
-check_in_repo_NNO false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-check_in_repo_NNO true "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-check_in_repo_NNO input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-
-check_in_repo_NNO false "auto" LF LF LF LF_mix_CR CRLF_nul
-check_in_repo_NNO true "auto" LF LF LF LF_mix_CR CRLF_nul
-check_in_repo_NNO input "auto" LF LF LF LF_mix_CR CRLF_nul
-
-check_in_repo_NNO false "text" LF LF LF LF_mix_CR LF_nul
-check_in_repo_NNO true "text" LF LF LF LF_mix_CR LF_nul
-check_in_repo_NNO input "text" LF LF LF LF_mix_CR LF_nul
-
-check_in_repo_NNO false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-check_in_repo_NNO true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-check_in_repo_NNO input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-
-
+for crlf in true false input
+do
+ # attr aeol LF CRLF CRLF_mix_LF LF_mix_CR CRLFNUL
+ check_in_repo_NNO "" "" $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+ check_in_repo_NNO -text "" $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+ check_in_repo_NNO -text lf $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+ check_in_repo_NNO -text crlf $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+ check_in_repo_NNO auto "" $crlf LF LF LF LF_mix_CR CRLF_nul
+ check_in_repo_NNO auto lf $crlf LF LF LF LF_mix_CR LF_nul
+ check_in_repo_NNO auto crlf $crlf LF LF LF LF_mix_CR LF_nul
+ check_in_repo_NNO text "" $crlf LF LF LF LF_mix_CR LF_nul
+ check_in_repo_NNO text lf $crlf LF LF LF LF_mix_CR LF_nul
+ check_in_repo_NNO text crlf $crlf LF LF LF LF_mix_CR LF_nul
+done
################################################################################
# Check how files in the repo are changed when they are checked out
# How to read the table below:
@@ -489,89 +492,47 @@ LFNUL=LF_nul
fi
export CRLF_MIX_LF_CR MIX NL
-checkout_files "" "" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" true crlf CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" true lf CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" "" "" true native CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "" ident "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" false "" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" false crlf CRLF CRLF CRLF LF_mix_CR LF_nul
-checkout_files "auto" "" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" false native $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" "" "" true "" CRLF CRLF CRLF LF_mix_CR LF_nul
-checkout_files "auto" "" "" true crlf CRLF CRLF CRLF LF_mix_CR LF_nul
-checkout_files "auto" "" "" true lf CRLF CRLF CRLF LF_mix_CR LF_nul
-checkout_files "auto" "" "" true native CRLF CRLF CRLF LF_mix_CR LF_nul
-checkout_files "auto" ident "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-checkout_files "auto" ident "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
-
-for id in "" ident;
+# Same handling with and without ident
+for id in "" ident
do
- checkout_files "crlf" "$id" "" false "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" false lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" false native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" input "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" input lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" true crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" true lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "crlf" "$id" "" true native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "lf" "$id" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "lf" "$id" "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "text" "$id" "" false "" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
- checkout_files "text" "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "text" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "text" "$id" "" false native $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
- checkout_files "text" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "text" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "text" "$id" "" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "text" "$id" "" true crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "text" "$id" "" true lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "text" "$id" "" true native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
- checkout_files "-text" "$id" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
- checkout_files "-text" "$id" "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ for ceol in lf crlf native
+ do
+ for crlf in true false input
+ do
+ # -text overrides core.autocrlf and core.eol
+ # text and eol=crlf or eol=lf override core.autocrlf and core.eol
+ checkout_files -text "$id" "" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files -text "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files -text "$id" "crlf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # text
+ checkout_files text "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files text "$id" "crlf" "$crlf" "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ # currently the same as text, eol=XXX
+ checkout_files auto "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files auto "$id" "crlf" "$crlf" "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ done
+
+ # core.autocrlf false, different core.eol
+ checkout_files "" "$id" "" false "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # core.autocrlf true
+ checkout_files "" "$id" "" true "$ceol" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # text: core.autocrlf = true overrides core.eol
+ checkout_files auto "$id" "" true "$ceol" CRLF CRLF CRLF LF_mix_CR LF_nul
+ checkout_files text "$id" "" true "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ # text: core.autocrlf = input overrides core.eol
+ checkout_files text "$id" "" input "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files auto "$id" "" input "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # text=auto + eol=XXX
+ done
+ # text: core.autocrlf=false uses core.eol
+ checkout_files text "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ checkout_files text "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # text: core.autocrlf=false and core.eol unset(or native) uses native eol
+ checkout_files text "$id" "" false "" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
+ checkout_files text "$id" "" false native $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL
+ # auto: core.autocrlf=false and core.eol unset(or native) uses native eol
+ checkout_files auto "$id" "" false "" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
+ checkout_files auto "$id" "" false native $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul
done
# Should be the last test case: remove some files from the worktree
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 9be6411..db5f60d 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -7,7 +7,7 @@ test_description='our own option parser'
. ./test-lib.sh
-cat > expect << EOF
+cat >expect <<\EOF
usage: test-parse-options <options>
--yes get a boolean
@@ -45,63 +45,24 @@ Standard options
-v, --verbose be verbose
-n, --dry-run dry run
-q, --quiet be quiet
+ --expect <string> expected output in the variable dump
EOF
test_expect_success 'test help' '
- test_must_fail test-parse-options -h > output 2> output.err &&
+ test_must_fail test-parse-options -h >output 2>output.err &&
test_must_be_empty output.err &&
test_i18ncmp expect output
'
mv expect expect.err
-cat >expect.template <<EOF
-boolean: 0
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: 0
-quiet: no
-dry run: no
-file: (not set)
-EOF
-
-check() {
+check () {
what="$1" &&
shift &&
expect="$1" &&
shift &&
- sed "s/^$what .*/$what $expect/" <expect.template >expect &&
- test-parse-options $* >output 2>output.err &&
- test_must_be_empty output.err &&
- test_cmp expect output
-}
-
-check_i18n() {
- what="$1" &&
- shift &&
- expect="$1" &&
- shift &&
- sed "s/^$what .*/$what $expect/" <expect.template >expect &&
- test-parse-options $* >output 2>output.err &&
- test_must_be_empty output.err &&
- test_i18ncmp expect output
-}
-
-check_unknown() {
- case "$1" in
- --*)
- echo error: unknown option \`${1#--}\' >expect ;;
- -*)
- echo error: unknown switch \`${1#-}\' >expect ;;
- esac &&
- cat expect.err >>expect &&
- test_must_fail test-parse-options $* >output 2>output.err &&
- test_must_be_empty output &&
- test_cmp expect output.err
+ test-parse-options --expect="$what $expect" "$@"
}
check_unknown_i18n() {
@@ -156,7 +117,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' '
check magnitude: 3221225472 -m 3g
'
-cat > expect << EOF
+cat >expect <<\EOF
boolean: 2
integer: 1729
magnitude: 16384
@@ -164,7 +125,7 @@ timestamp: 0
string: 123
abbrev: 7
verbose: 2
-quiet: no
+quiet: 0
dry run: yes
file: prefix/my.file
EOF
@@ -176,7 +137,7 @@ test_expect_success 'short options' '
test_must_be_empty output.err
'
-cat > expect << EOF
+cat >expect <<\EOF
boolean: 2
integer: 1729
magnitude: 16384
@@ -184,7 +145,7 @@ timestamp: 0
string: 321
abbrev: 10
verbose: 2
-quiet: no
+quiet: 0
dry run: no
file: prefix/fi.le
EOF
@@ -204,15 +165,15 @@ test_expect_success 'missing required value' '
test_expect_code 129 test-parse-options --file
'
-cat > expect << EOF
+cat >expect <<\EOF
boolean: 1
integer: 13
magnitude: 0
timestamp: 0
string: 123
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
arg 00: a1
@@ -222,32 +183,32 @@ EOF
test_expect_success 'intermingled arguments' '
test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
- > output 2> output.err &&
+ >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > expect << EOF
+cat >expect <<\EOF
boolean: 0
integer: 2
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'unambiguously abbreviated option' '
- test-parse-options --int 2 --boolean --no-bo > output 2> output.err &&
+ test-parse-options --int 2 --boolean --no-bo >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
test_expect_success 'unambiguously abbreviated option with "="' '
- test-parse-options --int=2 > output 2> output.err &&
+ test-parse-options --int=2 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
@@ -256,74 +217,74 @@ test_expect_success 'ambiguously abbreviated option' '
test_expect_code 129 test-parse-options --strin 123
'
-cat > expect << EOF
+cat >expect <<\EOF
boolean: 0
integer: 0
magnitude: 0
timestamp: 0
string: 123
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'non ambiguous option (after two options it abbreviates)' '
- test-parse-options --st 123 > output 2> output.err &&
+ test-parse-options --st 123 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > typo.err << EOF
-error: did you mean \`--boolean\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--boolean` (with two dashes ?)
EOF
test_expect_success 'detect possible typos' '
- test_must_fail test-parse-options -boolean > output 2> output.err &&
+ test_must_fail test-parse-options -boolean >output 2>output.err &&
test_must_be_empty output &&
test_cmp typo.err output.err
'
-cat > typo.err << EOF
-error: did you mean \`--ambiguous\` (with two dashes ?)
+cat >typo.err <<\EOF
+error: did you mean `--ambiguous` (with two dashes ?)
EOF
test_expect_success 'detect possible typos' '
- test_must_fail test-parse-options -ambiguous > output 2> output.err &&
+ test_must_fail test-parse-options -ambiguous >output 2>output.err &&
test_must_be_empty output &&
test_cmp typo.err output.err
'
-cat > expect <<EOF
+cat >expect <<\EOF
boolean: 0
integer: 0
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
arg 00: --quux
EOF
test_expect_success 'keep some options as arguments' '
- test-parse-options --quux > output 2> output.err &&
+ test-parse-options --quux >output 2>output.err &&
test_must_be_empty output.err &&
- test_cmp expect output
+ test_cmp expect output
'
-cat > expect <<EOF
+cat >expect <<\EOF
boolean: 0
integer: 0
magnitude: 0
timestamp: 1
string: (not set)
abbrev: 7
-verbose: 0
-quiet: yes
+verbose: -1
+quiet: 1
dry run: no
file: (not set)
arg 00: foo
@@ -331,12 +292,12 @@ EOF
test_expect_success 'OPT_DATE() works' '
test-parse-options -t "1970-01-01 00:00:01 +0000" \
- foo -q > output 2> output.err &&
+ foo -q >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+cat >expect <<\EOF
Callback: "four", 0
boolean: 5
integer: 4
@@ -344,112 +305,110 @@ magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
- test-parse-options --length=four -b -4 > output 2> output.err &&
+ test-parse-options --length=four -b -4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > expect <<EOF
-Callback: "not set", 1
-EOF
+>expect
test_expect_success 'OPT_CALLBACK() and callback errors work' '
- test_must_fail test-parse-options --no-length > output 2> output.err &&
+ test_must_fail test-parse-options --no-length >output 2>output.err &&
test_i18ncmp expect output &&
test_i18ncmp expect.err output.err
'
-cat > expect <<EOF
+cat >expect <<\EOF
boolean: 1
integer: 23
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
- test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err &&
+ test-parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
- test-parse-options --set23 -bbbbb --neg-or4 > output 2> output.err &&
+ test-parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+cat >expect <<\EOF
boolean: 6
integer: 0
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'OPT_BIT() works' '
- test-parse-options -bb --or4 > output 2> output.err &&
+ test-parse-options -bb --or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
test_expect_success 'OPT_NEGBIT() works' '
- test-parse-options -bb --no-neg-or4 > output 2> output.err &&
+ test-parse-options -bb --no-neg-or4 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
- test-parse-options + + + + + + > output 2> output.err &&
+ test-parse-options + + + + + + >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat > expect <<EOF
+cat >expect <<\EOF
boolean: 0
integer: 12345
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
test_expect_success 'OPT_NUMBER_CALLBACK() works' '
- test-parse-options -12345 > output 2> output.err &&
+ test-parse-options -12345 >output 2>output.err &&
test_must_be_empty output.err &&
test_cmp expect output
'
-cat >expect <<EOF
+cat >expect <<\EOF
boolean: 0
integer: 0
magnitude: 0
timestamp: 0
string: (not set)
abbrev: 7
-verbose: 0
-quiet: no
+verbose: -1
+quiet: 0
dry run: no
file: (not set)
EOF
@@ -460,7 +419,7 @@ test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
test_cmp expect output
'
-cat >>expect <<'EOF'
+cat >>expect <<\EOF
list: foo
list: bar
list: baz
@@ -476,4 +435,118 @@ test_expect_success '--no-list resets list' '
test_cmp expect output
'
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 3
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success 'multiple quiet levels' '
+ test-parse-options -q -q -q >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 3
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success 'multiple verbose levels' '
+ test-parse-options -v -v -v >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-quiet sets --quiet to 0' '
+ test-parse-options --no-quiet >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-quiet resets multiple -q to 0' '
+ test-parse-options -q -q -q --no-quiet >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 0
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-verbose sets verbose to 0' '
+ test-parse-options --no-verbose >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
+cat >expect <<\EOF
+boolean: 0
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: 0
+quiet: 0
+dry run: no
+file: (not set)
+EOF
+
+test_expect_success '--no-verbose resets multiple verbose to 0' '
+ test-parse-options -v -v -v --no-verbose >output 2>output.err &&
+ test_must_be_empty output.err &&
+ test_cmp expect output
+'
+
test_done
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 8532a02..bf2deee 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -19,6 +19,13 @@ relative_path() {
"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
}
+test_submodule_relative_url() {
+ test_expect_success "test_submodule_relative_url: $1 $2 $3 => $4" "
+ actual=\$(git submodule--helper resolve-relative-url-test '$1' '$2' '$3') &&
+ test \"\$actual\" = '$4'
+ "
+}
+
test_git_path() {
test_expect_success "git-path $1 $2 => $3" "
$1 git rev-parse --git-path $2 >actual &&
@@ -298,4 +305,43 @@ test_git_path GIT_COMMON_DIR=bar config bar/config
test_git_path GIT_COMMON_DIR=bar packed-refs bar/packed-refs
test_git_path GIT_COMMON_DIR=bar shallow bar/shallow
+# In the tests below, the distinction between $PWD and $(pwd) is important:
+# on Windows, $PWD is POSIX style (/c/foo), $(pwd) has drive letter (c:/foo).
+
+test_submodule_relative_url "../" "../foo" "../submodule" "../../submodule"
+test_submodule_relative_url "../" "../foo/bar" "../submodule" "../../foo/submodule"
+test_submodule_relative_url "../" "../foo/submodule" "../submodule" "../../foo/submodule"
+test_submodule_relative_url "../" "./foo" "../submodule" "../submodule"
+test_submodule_relative_url "../" "./foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "../../../" "../foo/bar" "../sub/a/b/c" "../../../../foo/sub/a/b/c"
+test_submodule_relative_url "../" "$PWD/addtest" "../repo" "$(pwd)/repo"
+test_submodule_relative_url "../" "foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "../" "foo" "../submodule" "../submodule"
+
+test_submodule_relative_url "(null)" "../foo/bar" "../sub/a/b/c" "../foo/sub/a/b/c"
+test_submodule_relative_url "(null)" "../foo/bar" "../submodule" "../foo/submodule"
+test_submodule_relative_url "(null)" "../foo/submodule" "../submodule" "../foo/submodule"
+test_submodule_relative_url "(null)" "../foo" "../submodule" "../submodule"
+test_submodule_relative_url "(null)" "./foo/bar" "../submodule" "foo/submodule"
+test_submodule_relative_url "(null)" "./foo" "../submodule" "submodule"
+test_submodule_relative_url "(null)" "//somewhere else/repo" "../subrepo" "//somewhere else/subrepo"
+test_submodule_relative_url "(null)" "$PWD/subsuper_update_r" "../subsubsuper_update_r" "$(pwd)/subsubsuper_update_r"
+test_submodule_relative_url "(null)" "$PWD/super_update_r2" "../subsuper_update_r" "$(pwd)/subsuper_update_r"
+test_submodule_relative_url "(null)" "$PWD/." "../." "$(pwd)/."
+test_submodule_relative_url "(null)" "$PWD" "./." "$(pwd)/."
+test_submodule_relative_url "(null)" "$PWD/addtest" "../repo" "$(pwd)/repo"
+test_submodule_relative_url "(null)" "$PWD" "./å äö" "$(pwd)/å äö"
+test_submodule_relative_url "(null)" "$PWD/." "../submodule" "$(pwd)/submodule"
+test_submodule_relative_url "(null)" "$PWD/submodule" "../submodule" "$(pwd)/submodule"
+test_submodule_relative_url "(null)" "$PWD/home2/../remote" "../bundle1" "$(pwd)/home2/../bundle1"
+test_submodule_relative_url "(null)" "$PWD/submodule_update_repo" "./." "$(pwd)/submodule_update_repo/."
+test_submodule_relative_url "(null)" "file:///tmp/repo" "../subrepo" "file:///tmp/subrepo"
+test_submodule_relative_url "(null)" "foo/bar" "../submodule" "foo/submodule"
+test_submodule_relative_url "(null)" "foo" "../submodule" "submodule"
+test_submodule_relative_url "(null)" "helper:://hostname/repo" "../subrepo" "helper:://hostname/subrepo"
+test_submodule_relative_url "(null)" "ssh://hostname/repo" "../subrepo" "ssh://hostname/subrepo"
+test_submodule_relative_url "(null)" "ssh://hostname:22/repo" "../subrepo" "ssh://hostname:22/subrepo"
+test_submodule_relative_url "(null)" "user@host:path/to/repo" "../subrepo" "user@host:path/to/subrepo"
+test_submodule_relative_url "(null)" "user@host:repo" "../subrepo" "user@host:subrepo"
+
test_done
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index d7ef44b..03bd31e 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -298,4 +298,15 @@ test_expect_success 'helpers can abort the process' '
test_cmp expect stdout
'
+test_expect_success 'empty helper spec resets helper list' '
+ test_config credential.helper "verbatim file file" &&
+ check fill "" "verbatim cmdline cmdline" <<-\EOF
+ --
+ username=cmdline
+ password=cmdline
+ --
+ verbatim: get
+ EOF
+'
+
test_done
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 8e22b03..df3183e 100755
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -141,13 +141,13 @@ test_expect_success 'GIT_PREFIX for !alias' '
test_expect_success 'GIT_PREFIX for built-ins' '
# Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
# receives the GIT_PREFIX variable.
- printf "dir/" >expect &&
- printf "#!/bin/sh\n" >diff &&
- printf "printf \"\$GIT_PREFIX\"" >>diff &&
- chmod +x diff &&
+ echo "dir/" >expect &&
+ write_script diff <<-\EOF &&
+ printf "%s\n" "$GIT_PREFIX"
+ EOF
(
cd dir &&
- printf "change" >two &&
+ echo "change" >two &&
GIT_EXTERNAL_DIFF=./diff git diff >../actual
git checkout -- two
) &&
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 6767da8..d934a24 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1087,6 +1087,20 @@ test_expect_success 'git -c complains about empty key and value' '
test_must_fail git -c "" rev-parse
'
+test_expect_success 'multiple git -c appends config' '
+ test_config alias.x "!git -c x.two=2 config --get-regexp ^x\.*" &&
+ cat >expect <<-\EOF &&
+ x.one 1
+ x.two 2
+ EOF
+ git -c x.one=1 x >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git -c is not confused by empty environment' '
+ GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
+'
+
test_expect_success 'git config --edit works' '
git config -f tmp test.value no &&
echo test.value=yes >expect &&
@@ -1144,6 +1158,9 @@ test_expect_success 'urlmatch' '
cookieFile = /tmp/cookie.txt
EOF
+ test_expect_code 1 git config --bool --get-urlmatch doesnt.exist https://good.example.com >actual &&
+ test_must_be_empty actual &&
+
echo true >expect &&
git config --bool --get-urlmatch http.SSLverify https://good.example.com >actual &&
test_cmp expect actual &&
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
new file mode 100755
index 0000000..5e3fb3a
--- /dev/null
+++ b/t/t1350-config-hooks-path.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='Test the core.hooksPath configuration variable'
+
+. ./test-lib.sh
+
+test_expect_success 'set up a pre-commit hook in core.hooksPath' '
+ mkdir -p .git/custom-hooks .git/hooks &&
+ write_script .git/custom-hooks/pre-commit <<-\EOF &&
+ echo CUSTOM >>actual
+ EOF
+ write_script .git/hooks/pre-commit <<-\EOF
+ echo NORMAL >>actual
+ EOF
+'
+
+test_expect_success 'Check that various forms of specifying core.hooksPath work' '
+ test_commit no_custom_hook &&
+ git config core.hooksPath .git/custom-hooks &&
+ test_commit have_custom_hook &&
+ git config core.hooksPath .git/custom-hooks/ &&
+ test_commit have_custom_hook_trailing_slash &&
+ git config core.hooksPath "$PWD/.git/custom-hooks" &&
+ test_commit have_custom_hook_abs_path &&
+ git config core.hooksPath "$PWD/.git/custom-hooks/" &&
+ test_commit have_custom_hook_abs_path_trailing_slash &&
+ cat >expect <<-\EOF &&
+ NORMAL
+ CUSTOM
+ CUSTOM
+ CUSTOM
+ CUSTOM
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index c623824..9cf91dc 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -338,4 +338,14 @@ test_expect_failure 'reflog with non-commit entries displays all entries' '
test_line_count = 3 actual
'
+test_expect_success 'reflog expire operates on symref not referrent' '
+ git branch -l the_symref &&
+ git branch -l referrent &&
+ git update-ref referrent HEAD &&
+ git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
+ test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
+ touch .git/refs/heads/referrent.lock &&
+ git reflog expire --expire=all the_symref
+'
+
test_done
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index c465abe..25ddab4 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -42,7 +42,7 @@ test_expect_success 'git branch shows badly named ref as warning' '
cp .git/refs/heads/master .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch >output 2>error &&
- grep -e "broken\.\.\.ref" error &&
+ test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
'
@@ -147,35 +147,145 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch shadow one &&
cp .git/refs/heads/master .git/refs/heads/broken...ref &&
- git symbolic-ref refs/tags/shadow refs/heads/broken...ref &&
-
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
+ test_when_finished "rm -f .git/refs/tags/shadow" &&
git rev-parse --verify one >expect &&
git rev-parse --verify shadow >actual 2>err &&
test_cmp expect actual &&
- test_i18ngrep "ignoring.*refs/tags/shadow" err
+ test_i18ngrep "ignoring dangling symref refs/tags/shadow" err
'
-test_expect_success 'update-ref --no-deref -d can delete reference to broken name' '
- git symbolic-ref refs/heads/badname refs/heads/broken...ref &&
+test_expect_success 'for-each-ref emits warnings for broken names' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
- test_path_is_file .git/refs/heads/badname &&
- git update-ref --no-deref -d refs/heads/badname &&
- test_path_is_missing .git/refs/heads/badname
+ printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git for-each-ref >output 2>error &&
+ ! grep -e "broken\.\.\.ref" output &&
+ ! grep -e "badname" output &&
+ ! grep -e "broken\.\.\.symref" output &&
+ test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+ test_i18ngrep "ignoring broken ref refs/heads/badname" error &&
+ test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
'
test_expect_success 'update-ref -d can delete broken name' '
cp .git/refs/heads/master .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
- git update-ref -d refs/heads/broken...ref &&
+ git update-ref -d refs/heads/broken...ref >output 2>error &&
+ test_must_be_empty output &&
+ test_must_be_empty error &&
+ git branch >output 2>error &&
+ ! grep -e "broken\.\.\.ref" error &&
+ ! grep -e "broken\.\.\.ref" output
+'
+
+test_expect_success 'branch -d can delete broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ git branch -d broken...ref >output 2>error &&
+ test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
+ test_must_be_empty error &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
'
+test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete symref to broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git branch -d badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref to broken name' '
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git branch -d badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref -d can delete broken name through symref' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git update-ref -d refs/heads/badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...ref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
+ printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete symref with broken name' '
+ printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git branch -d broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
+ printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref with broken name' '
+ printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git branch -d broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+ test_must_be_empty error
+'
+
test_expect_success 'update-ref -d cannot delete non-ref in .git dir' '
echo precious >.git/my-private-file &&
echo precious >expect &&
- test_must_fail git update-ref -d my-private-file &&
+ test_must_fail git update-ref -d my-private-file >output 2>error &&
+ test_must_be_empty output &&
+ test_i18ngrep -e "cannot lock .*: unable to resolve reference" error &&
test_cmp expect .git/my-private-file
'
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index e66b7cb..7ee8ea0 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -427,6 +427,24 @@ test_expect_success 'fsck allows .Ňit' '
)
'
+test_expect_success 'NUL in commit' '
+ rm -fr nul-in-commit &&
+ git init nul-in-commit &&
+ (
+ cd nul-in-commit &&
+ git commit --allow-empty -m "initial commitQNUL after message" &&
+ git cat-file commit HEAD >original &&
+ q_to_nul <original >munged &&
+ git hash-object -w -t commit --stdin <munged >name &&
+ git branch bad $(cat name) &&
+
+ test_must_fail git -c fsck.nulInCommit=error fsck 2>warn.1 &&
+ grep nulInCommit warn.1 &&
+ git fsck 2>warn.2 &&
+ grep nulInCommit warn.2
+ )
+'
+
# create a static test repo which is broken by omitting
# one particular object ($1, which is looked up via rev-parse
# in the new repository).
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 48ee077..038e24c 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -3,85 +3,88 @@
test_description='test git rev-parse'
. ./test-lib.sh
-test_rev_parse() {
- name=$1
- shift
-
- test_expect_success "$name: is-bare-repository" \
- "test '$1' = \"\$(git rev-parse --is-bare-repository)\""
- shift
- [ $# -eq 0 ] && return
-
- test_expect_success "$name: is-inside-git-dir" \
- "test '$1' = \"\$(git rev-parse --is-inside-git-dir)\""
- shift
- [ $# -eq 0 ] && return
+# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir
+test_rev_parse () {
+ d=
+ bare=
+ gitdir=
+ while :
+ do
+ case "$1" in
+ -C) d="$2"; shift; shift ;;
+ -b) case "$2" in
+ [tfu]*) bare="$2"; shift; shift ;;
+ *) error "test_rev_parse: bogus core.bare value '$2'" ;;
+ esac ;;
+ -g) gitdir="$2"; shift; shift ;;
+ -*) error "test_rev_parse: unrecognized option '$1'" ;;
+ *) break ;;
+ esac
+ done
- test_expect_success "$name: is-inside-work-tree" \
- "test '$1' = \"\$(git rev-parse --is-inside-work-tree)\""
- shift
- [ $# -eq 0 ] && return
-
- test_expect_success "$name: prefix" \
- "test '$1' = \"\$(git rev-parse --show-prefix)\""
+ name=$1
shift
- [ $# -eq 0 ] && return
- test_expect_success "$name: git-dir" \
- "test '$1' = \"\$(git rev-parse --git-dir)\""
- shift
- [ $# -eq 0 ] && return
+ for o in --is-bare-repository \
+ --is-inside-git-dir \
+ --is-inside-work-tree \
+ --show-prefix \
+ --git-dir
+ do
+ test $# -eq 0 && break
+ expect="$1"
+ test_expect_success "$name: $o" '
+ if test -n "$gitdir"
+ then
+ test_when_finished "unset GIT_DIR" &&
+ GIT_DIR="$gitdir" &&
+ export GIT_DIR
+ fi &&
+
+ case "$bare" in
+ t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+ f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+ u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+ esac &&
+
+ echo "$expect" >expect &&
+ git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+ test_cmp expect actual
+ '
+ shift
+ done
}
-# label is-bare is-inside-git is-inside-work prefix git-dir
-
ROOT=$(pwd)
+test_expect_success 'setup' '
+ mkdir -p sub/dir work &&
+ cp -R .git repo.git
+'
+
test_rev_parse toplevel false false true '' .git
-cd .git || exit 1
-test_rev_parse .git/ false true false '' .
-cd objects || exit 1
-test_rev_parse .git/objects/ false true false '' "$ROOT/.git"
-cd ../.. || exit 1
+test_rev_parse -C .git .git/ false true false '' .
+test_rev_parse -C .git/objects .git/objects/ false true false '' "$ROOT/.git"
-mkdir -p sub/dir || exit 1
-cd sub/dir || exit 1
-test_rev_parse subdirectory false false true sub/dir/ "$ROOT/.git"
-cd ../.. || exit 1
+test_rev_parse -C sub/dir subdirectory false false true sub/dir/ "$ROOT/.git"
-git config core.bare true
-test_rev_parse 'core.bare = true' true false false
+test_rev_parse -b t 'core.bare = true' true false false
-git config --unset core.bare
-test_rev_parse 'core.bare undefined' false false true
+test_rev_parse -b u 'core.bare undefined' false false true
-mkdir work || exit 1
-cd work || exit 1
-GIT_DIR=../.git
-GIT_CONFIG="$(pwd)"/../.git/config
-export GIT_DIR GIT_CONFIG
-git config core.bare false
-test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true ''
+test_rev_parse -C work -g ../.git -b f 'GIT_DIR=../.git, core.bare = false' false false true ''
-git config core.bare true
-test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false false ''
+test_rev_parse -C work -g ../.git -b t 'GIT_DIR=../.git, core.bare = true' true false false ''
-git config --unset core.bare
-test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true ''
+test_rev_parse -C work -g ../.git -b u 'GIT_DIR=../.git, core.bare undefined' false false true ''
-mv ../.git ../repo.git || exit 1
-GIT_DIR=../repo.git
-GIT_CONFIG="$(pwd)"/../repo.git/config
-git config core.bare false
-test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true ''
+test_rev_parse -C work -g ../repo.git -b f 'GIT_DIR=../repo.git, core.bare = false' false false true ''
-git config core.bare true
-test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true false false ''
+test_rev_parse -C work -g ../repo.git -b t 'GIT_DIR=../repo.git, core.bare = true' true false false ''
-git config --unset core.bare
-test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
+test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
test_done
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 613d9bf..86c2ff2 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -166,11 +166,6 @@ test_expect_success 'relative path when cwd is outside worktree' '
grep "relative path syntax can.t be used outside working tree." error
'
-test_expect_success 'relative path when startup_info is NULL' '
- test_must_fail test-match-trees HEAD:./file.txt HEAD:./file.txt 2>error &&
- grep "BUG: startup_info struct is not initialized." error
-'
-
test_expect_success '<commit>:file correctly diagnosed after a pathname' '
test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
test_i18ngrep ! "exists on disk" error &&
diff --git a/t/t1515-rev-parse-outside-repo.sh b/t/t1515-rev-parse-outside-repo.sh
new file mode 100755
index 0000000..3ec2971
--- /dev/null
+++ b/t/t1515-rev-parse-outside-repo.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+test_description='check that certain rev-parse options work outside repo'
+. ./test-lib.sh
+
+test_expect_success 'set up non-repo directory' '
+ GIT_CEILING_DIRECTORIES=$(pwd) &&
+ export GIT_CEILING_DIRECTORIES &&
+ mkdir non-repo &&
+ cd non-repo &&
+ # confirm that git does not find a repo
+ test_must_fail git rev-parse --git-dir
+'
+
+# Rather than directly test the output of sq-quote directly,
+# make sure the shell can read back a tricky case, since
+# that's what we really care about anyway.
+tricky="really tricky with \\ and \" and '"
+dump_args () {
+ for i in "$@"; do
+ echo "arg: $i"
+ done
+}
+test_expect_success 'rev-parse --sq-quote' '
+ dump_args "$tricky" easy >expect &&
+ eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rev-parse --local-env-vars' '
+ git rev-parse --local-env-vars >actual &&
+ # we do not want to depend on the complete list here,
+ # so just look for something plausible
+ grep ^GIT_DIR actual
+'
+
+test_expect_success 'rev-parse --resolve-git-dir' '
+ git init --separate-git-dir repo dir &&
+ test_must_fail git rev-parse --resolve-git-dir . &&
+ echo "$(pwd)/repo" >expect &&
+ git rev-parse --resolve-git-dir dir/.git >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index cbfa41e..3a22fc5 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -4,6 +4,8 @@ test_description='test git worktree add'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
test_expect_success 'setup' '
test_commit init
'
@@ -213,4 +215,73 @@ test_expect_success 'local clone from linked checkout' '
( cd here-clone && git fsck )
'
+test_expect_success '"add" worktree with --no-checkout' '
+ git worktree add --no-checkout -b swamp swamp &&
+ ! test -e swamp/init.t &&
+ git -C swamp reset --hard &&
+ test_cmp init.t swamp/init.t
+'
+
+test_expect_success '"add" worktree with --checkout' '
+ git worktree add --checkout -b swmap2 swamp2 &&
+ test_cmp init.t swamp2/init.t
+'
+
+test_expect_success 'put a worktree under rebase' '
+ git worktree add under-rebase &&
+ (
+ cd under-rebase &&
+ set_fake_editor &&
+ FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+ git worktree list | grep "under-rebase.*detached HEAD"
+ )
+'
+
+test_expect_success 'add a worktree, checking out a rebased branch' '
+ test_must_fail git worktree add new-rebase under-rebase &&
+ ! test -d new-rebase
+'
+
+test_expect_success 'checking out a rebased branch from another worktree' '
+ git worktree add new-place &&
+ test_must_fail git -C new-place checkout under-rebase
+'
+
+test_expect_success 'not allow to delete a branch under rebase' '
+ (
+ cd under-rebase &&
+ test_must_fail git branch -D under-rebase
+ )
+'
+
+test_expect_success 'rename a branch under rebase not allowed' '
+ test_must_fail git branch -M under-rebase rebase-with-new-name
+'
+
+test_expect_success 'check out from current worktree branch ok' '
+ (
+ cd under-rebase &&
+ git checkout under-rebase &&
+ git checkout - &&
+ git rebase --abort
+ )
+'
+
+test_expect_success 'checkout a branch under bisect' '
+ git worktree add under-bisect &&
+ (
+ cd under-bisect &&
+ git bisect start &&
+ git bisect bad &&
+ git bisect good HEAD~2 &&
+ git worktree list | grep "under-bisect.*detached HEAD" &&
+ test_must_fail git worktree add new-bisect under-bisect &&
+ ! test -d new-bisect
+ )
+'
+
+test_expect_success 'rename a branch under bisect not allowed' '
+ test_must_fail git branch -M under-bisect bisect-with-new-name
+'
+
test_done
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index 9965bc5..cccd7d9 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -8,7 +8,8 @@ test_cd_to_toplevel () {
test_expect_success $3 "$2" '
(
cd '"'$1'"' &&
- . "$(git --exec-path)"/git-sh-setup &&
+ PATH="$(git --exec-path):$PATH" &&
+ . git-sh-setup &&
cd_to_toplevel &&
[ "$(pwd -P)" = "$TOPLEVEL" ]
)
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index 46aadc4..d314599 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -19,6 +19,8 @@ test_expect_success setup '
test_commit three &&
git checkout right &&
test_commit four &&
+ git checkout --orphan newroot &&
+ test_commit five &&
git checkout master
'
@@ -133,4 +135,18 @@ test_expect_success 'merge FETCH_HEAD octopus non-fast-forward' '
test_cmp expect actual
'
+# two-project merge
+test_expect_success 'refuse two-project merge by default' '
+ t3033_reset &&
+ git reset --hard four &&
+ test_must_fail git merge five
+'
+
+test_expect_success 'two-project merge with --allow-unrelated-histories' '
+ t3033_reset &&
+ git reset --hard four &&
+ git merge --allow-unrelated-histories five &&
+ git diff --exit-code five
+'
+
test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index a897248..f3e3b6c 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -126,7 +126,28 @@ test_expect_success 'git branch -M foo bar should fail when bar is checked out'
test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
git checkout -b baz &&
git branch bam &&
- git branch -M baz bam
+ git branch -M baz bam &&
+ test $(git rev-parse --abbrev-ref HEAD) = bam
+'
+
+test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' '
+ git checkout master &&
+ git worktree add -b baz bazdir &&
+ git worktree add -f bazdir2 baz &&
+ git branch -M baz bam &&
+ test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
+ test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam
+'
+
+test_expect_success 'git branch -M baz bam should succeed within a worktree in which baz is checked out' '
+ git checkout -b baz &&
+ git worktree add -f bazdir3 baz &&
+ (
+ cd bazdir3 &&
+ git branch -M baz bam &&
+ test $(git rev-parse --abbrev-ref HEAD) = bam
+ ) &&
+ test $(git rev-parse --abbrev-ref HEAD) = bam
'
test_expect_success 'git branch -M master should work when master is checked out' '
@@ -403,6 +424,12 @@ test_expect_success 'test deleting branch without config' '
test_i18ncmp expect actual
'
+test_expect_success 'deleting currently checked out branch fails' '
+ git worktree add -b my7 my7 &&
+ test_must_fail git -C my7 branch -d my7 &&
+ test_must_fail git branch -d my7
+'
+
test_expect_success 'test --track without .fetch entries' '
git branch --track my8 &&
test "$(git config branch.my8.remote)" &&
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 4261403..c6a3ccb 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -184,4 +184,16 @@ test_expect_success 'ambiguous branch/tag not marked' '
test_cmp expect actual
'
+test_expect_success 'local-branch symrefs shortened properly' '
+ git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
+ git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
+ cat >expect <<-\EOF &&
+ ref-to-branch -> branch-one
+ ref-to-remote -> refs/remotes/origin/branch-one
+ EOF
+ git branch >actual.raw &&
+ grep ref-to <actual.raw >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index 8f64505..488945e 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -85,6 +85,15 @@ test_expect_success 'rebase -Xtheirs' '
! grep 11 original
'
+test_expect_success 'rebase -Xtheirs from orphan' '
+ git checkout --orphan orphan-conflicting master~2 &&
+ echo "AB $T" >> original &&
+ git commit -morphan-conflicting original &&
+ git rebase -Xtheirs master &&
+ grep AB original &&
+ ! grep 11 original
+'
+
test_expect_success 'merge and rebase should match' '
git diff-tree -r test-rebase test-merge >difference &&
if test -s difference
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 544f9ad..66348f1 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -62,7 +62,7 @@ test_expect_success 'setup' '
# "exec" commands are ran with the user shell by default, but this may
# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
-# to create a file. Unseting SHELL avoids such non-portable behavior
+# to create a file. Unsetting SHELL avoids such non-portable behavior
# in tests. It must be exported for it to take effect where needed.
SHELL=
export SHELL
@@ -555,10 +555,9 @@ test_expect_success 'rebase a detached HEAD' '
test_expect_success 'rebase a commit violating pre-commit' '
mkdir -p .git/hooks &&
- PRE_COMMIT=.git/hooks/pre-commit &&
- echo "#!/bin/sh" > $PRE_COMMIT &&
- echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
- chmod a+x $PRE_COMMIT &&
+ write_script .git/hooks/pre-commit <<-\EOF &&
+ test -z "$(git diff --cached --check)"
+ EOF
echo "monde! " >> file1 &&
test_tick &&
test_must_fail git commit -m doesnt-verify file1 &&
@@ -771,7 +770,6 @@ test_expect_success 'rebase-i history with funny messages' '
test_cmp expect actual
'
-
test_expect_success 'prepare for rebase -i --exec' '
git checkout master &&
git checkout -b execute &&
@@ -780,7 +778,6 @@ test_expect_success 'prepare for rebase -i --exec' '
test_commit three_exec main.txt three_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 &&
@@ -793,7 +790,6 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
test_cmp expected actual
'
-
test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git reset --hard execute &&
set_fake_editor &&
@@ -807,7 +803,6 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
test_cmp expected actual
'
-
test_expect_success 'running "git rebase -ix git show HEAD"' '
git reset --hard execute &&
set_fake_editor &&
@@ -835,7 +830,6 @@ test_expect_success 'rebase -ix with several <CMD>' '
test_cmp expected actual
'
-
test_expect_success 'rebase -ix with several instances of --exec' '
git reset --hard execute &&
set_fake_editor &&
@@ -850,7 +844,6 @@ test_expect_success 'rebase -ix with several instances of --exec' '
test_cmp expected actual
'
-
test_expect_success 'rebase -ix with --autosquash' '
git reset --hard execute &&
git checkout -b autosquash &&
@@ -876,16 +869,15 @@ test_expect_success 'rebase -ix with --autosquash' '
test_cmp expected actual
'
-
-test_expect_success 'rebase --exec without -i shows error message' '
+test_expect_success 'rebase --exec works without -i ' '
git reset --hard execute &&
- set_fake_editor &&
- test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
- echo "The --exec option must be used with the --interactive option" >expected &&
- test_i18ncmp expected actual
+ rm -rf exec_output &&
+ EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual &&
+ test_i18ngrep "Successfully rebased and updated" actual &&
+ test_line_count = 2 exec_output &&
+ test_path_is_missing invoked_editor
'
-
test_expect_success 'rebase -i --exec without <CMD>' '
git reset --hard execute &&
set_fake_editor &&
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 0b52105..73a39f2 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -133,7 +133,7 @@ test_expect_success 'set up second root and merge' '
rm A B C &&
test_commit 6 D &&
git checkout other &&
- git merge third
+ git merge --allow-unrelated-histories third
'
cat > expect-third <<'EOF'
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 217dd79..49f548c 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -73,17 +73,17 @@ do_tests () {
run git format-patch --stdout --ignore-if-in-upstream master
"
- test_expect_success $pr 'detect upstream patch' "
+ test_expect_success $pr 'detect upstream patch' '
git checkout -q master &&
scramble file &&
git add file &&
- git commit -q -m 'change big file again' &&
+ 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~)\"
- "
+ test_must_fail test -n "$(git rev-list master...HEAD~)"
+ '
- test_expect_success $pr 'do not drop patch' "
+ test_expect_success $pr 'do not drop patch' '
git branch -f squashed master &&
git checkout -q -f squashed &&
git reset -q --soft HEAD~2 &&
@@ -91,7 +91,7 @@ do_tests () {
git checkout -q other^{} &&
test_must_fail git rebase squashed &&
rm -rf .git/rebase-apply
- "
+ '
}
do_tests 500
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 9c55cba..68fe200 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -253,7 +253,7 @@ test_run_rebase () {
"
}
test_run_rebase success ''
-test_run_rebase failure -m
+test_run_rebase success -m
test_run_rebase success -i
test_run_rebase success -p
@@ -268,7 +268,7 @@ test_run_rebase () {
"
}
test_run_rebase success ''
-test_run_rebase failure -m
+test_run_rebase success -m
test_run_rebase success -i
test_run_rebase failure -p
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh
index a1c4e02..db93781 100755
--- a/t/t3513-revert-submodule.sh
+++ b/t/t3513-revert-submodule.sh
@@ -14,11 +14,11 @@ test_description='revert can handle submodules'
git_revert () {
git status -su >expect &&
ls -1pR * >>expect &&
- tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
+ tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
git checkout "$1" &&
git revert HEAD &&
rm -rf * &&
- tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
+ tar xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&
diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh
index 8319356..26dd5b7 100755
--- a/t/t3910-mac-os-precompose.sh
+++ b/t/t3910-mac-os-precompose.sh
@@ -49,12 +49,54 @@ test_expect_success "setup" '
test_expect_success "setup case mac" '
git checkout -b mac_os
'
+# This will test nfd2nfc in git diff
+test_expect_success "git diff f.Adiar" '
+ touch f.$Adiarnfc &&
+ git add f.$Adiarnfc &&
+ echo f.Adiarnfc >f.$Adiarnfc &&
+ git diff f.$Adiarnfd >expect &&
+ git diff f.$Adiarnfc >actual &&
+ test_cmp expect actual &&
+ git reset HEAD f.Adiarnfc &&
+ rm f.$Adiarnfc expect actual
+'
+# This will test nfd2nfc in git diff-files
+test_expect_success "git diff-files f.Adiar" '
+ touch f.$Adiarnfc &&
+ git add f.$Adiarnfc &&
+ echo f.Adiarnfc >f.$Adiarnfc &&
+ git diff-files f.$Adiarnfd >expect &&
+ git diff-files f.$Adiarnfc >actual &&
+ test_cmp expect actual &&
+ git reset HEAD f.Adiarnfc &&
+ rm f.$Adiarnfc expect actual
+'
+# This will test nfd2nfc in git diff-index
+test_expect_success "git diff-index f.Adiar" '
+ touch f.$Adiarnfc &&
+ git add f.$Adiarnfc &&
+ echo f.Adiarnfc >f.$Adiarnfc &&
+ git diff-index HEAD f.$Adiarnfd >expect &&
+ git diff-index HEAD f.$Adiarnfc >actual &&
+ test_cmp expect actual &&
+ git reset HEAD f.Adiarnfc &&
+ rm f.$Adiarnfc expect actual
+'
# This will test nfd2nfc in readdir()
test_expect_success "add file Adiarnfc" '
echo f.Adiarnfc >f.$Adiarnfc &&
git add f.$Adiarnfc &&
git commit -m "add f.$Adiarnfc"
'
+# This will test nfd2nfc in git diff-tree
+test_expect_success "git diff-tree f.Adiar" '
+ echo f.Adiarnfc >>f.$Adiarnfc &&
+ git diff-tree HEAD f.$Adiarnfd >expect &&
+ git diff-tree HEAD f.$Adiarnfc >actual &&
+ test_cmp expect actual &&
+ git checkout f.$Adiarnfc &&
+ rm expect actual
+'
# This will test nfd2nfc in git stage()
test_expect_success "stage file d.Adiarnfd/f.Adiarnfd" '
mkdir d.$Adiarnfd &&
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 2f327b7..0d1fa45 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -9,21 +9,84 @@ test_description='Test rename detection in diff engine.
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh
-echo >path0 'Line 1
-Line 2
-Line 3
-Line 4
-Line 5
-Line 6
-Line 7
-Line 8
-Line 9
-Line 10
-line 11
-Line 12
-Line 13
-Line 14
-Line 15
+test_expect_success 'setup' '
+ cat >path0 <<-\EOF &&
+ Line 1
+ Line 2
+ Line 3
+ Line 4
+ Line 5
+ Line 6
+ Line 7
+ Line 8
+ Line 9
+ Line 10
+ line 11
+ Line 12
+ Line 13
+ Line 14
+ Line 15
+ EOF
+ cat >expected <<-\EOF &&
+ diff --git a/path0 b/path1
+ rename from path0
+ rename to path1
+ --- a/path0
+ +++ b/path1
+ @@ -8,7 +8,7 @@ Line 7
+ Line 8
+ Line 9
+ Line 10
+ -line 11
+ +Line 11
+ Line 12
+ Line 13
+ Line 14
+ EOF
+ cat >no-rename <<-\EOF
+ diff --git a/path0 b/path0
+ deleted file mode 100644
+ index fdbec44..0000000
+ --- a/path0
+ +++ /dev/null
+ @@ -1,15 +0,0 @@
+ -Line 1
+ -Line 2
+ -Line 3
+ -Line 4
+ -Line 5
+ -Line 6
+ -Line 7
+ -Line 8
+ -Line 9
+ -Line 10
+ -line 11
+ -Line 12
+ -Line 13
+ -Line 14
+ -Line 15
+ diff --git a/path1 b/path1
+ new file mode 100644
+ index 0000000..752c50e
+ --- /dev/null
+ +++ b/path1
+ @@ -0,0 +1,15 @@
+ +Line 1
+ +Line 2
+ +Line 3
+ +Line 4
+ +Line 5
+ +Line 6
+ +Line 7
+ +Line 8
+ +Line 9
+ +Line 10
+ +Line 11
+ +Line 12
+ +Line 13
+ +Line 14
+ +Line 15
+ EOF
'
test_expect_success \
@@ -43,27 +106,27 @@ test_expect_success \
test_expect_success \
'git diff-index -p -M after rename and editing.' \
'git diff-index -p -M $tree >current'
-cat >expected <<\EOF
-diff --git a/path0 b/path1
-rename from path0
-rename to path1
---- a/path0
-+++ b/path1
-@@ -8,7 +8,7 @@ Line 7
- Line 8
- Line 9
- Line 10
--line 11
-+Line 11
- Line 12
- Line 13
- Line 14
-EOF
+
test_expect_success \
'validate the output.' \
'compare_diff_patch current expected'
+test_expect_success 'test diff.renames=true' '
+ git -c diff.renames=true diff --cached $tree >current &&
+ compare_diff_patch current expected
+'
+
+test_expect_success 'test diff.renames=false' '
+ git -c diff.renames=false diff --cached $tree >current &&
+ compare_diff_patch current no-rename
+'
+
+test_expect_success 'test diff.renames unset' '
+ git diff --cached $tree >current &&
+ compare_diff_patch current expected
+'
+
test_expect_success 'favour same basenames over different ones' '
cp path1 another-path &&
git add another-path &&
@@ -77,6 +140,17 @@ test_expect_success 'favour same basenames even with minor differences' '
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
+test_expect_success 'two files with same basename and same content' '
+ git reset --hard &&
+ mkdir -p dir/A dir/B &&
+ cp path1 dir/A/file &&
+ cp path1 dir/B/file &&
+ git add dir &&
+ git commit -m 2 &&
+ git mv dir other-dir &&
+ git status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file"
+'
+
test_expect_success 'setup for many rename source candidates' '
git reset --hard &&
for i in 0 1 2 3 4 5 6 7 8 9;
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6ec6072..94ef500 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -90,6 +90,8 @@ test_expect_success setup '
git commit -m "Rearranged lines in dir/sub" &&
git checkout master &&
+ git config diff.renames false &&
+
git show-branch
'
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 3b99434..805dc90 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -549,7 +549,7 @@ test_expect_success 'cover-letter inherits diff options' '
git mv file foo &&
git commit -m foo &&
- git format-patch --cover-letter -1 &&
+ git format-patch --no-renames --cover-letter -1 &&
check_patch 0000-cover-letter.patch &&
! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
git format-patch --cover-letter -1 -M &&
@@ -703,7 +703,7 @@ test_expect_success 'options no longer allowed for format-patch' '
test_expect_success 'format-patch --numstat should produce a patch' '
git format-patch --numstat --stdout master..side > output &&
- test 6 = $(grep "^diff --git a/" output | wc -l)'
+ test 5 = $(grep "^diff --git a/" output | wc -l)'
test_expect_success 'format-patch -- <path>' '
git format-patch master..side -- file 2>error &&
@@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' '
'
test_expect_success 'in-body headers trigger content encoding' '
- GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
+ test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
test_when_finished "git reset --hard HEAD^" &&
git format-patch -1 --stdout --from >patch &&
cat >expect <<-\EOF &&
@@ -1460,4 +1460,109 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
test_path_is_dir patchset
'
+test_expect_success 'format-patch --base' '
+ git checkout side &&
+ git format-patch --stdout --base=HEAD~3 -1 >patch &&
+ grep "^base-commit:" patch >actual &&
+ grep "^prerequisite-patch-id:" patch >>actual &&
+ 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 &&
+ test_cmp expected actual
+'
+
+test_expect_success 'format-patch --base errors out when base commit is in revision list' '
+ test_must_fail git format-patch --base=HEAD -2 &&
+ 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
+'
+
+test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' '
+ # For history as below:
+ #
+ # ---Q---P---Z---Y---*---X
+ # \ /
+ # ------------W
+ #
+ # If "format-patch Z..X" is given, P and Z can not be specified as the base commit
+ git checkout -b topic1 master &&
+ git rev-parse HEAD >commit-id-base &&
+ test_commit P &&
+ git rev-parse HEAD >commit-id-P &&
+ test_commit Z &&
+ git rev-parse HEAD >commit-id-Z &&
+ test_commit Y &&
+ git checkout -b topic2 master &&
+ test_commit W &&
+ git merge topic1 &&
+ test_commit X &&
+ test_must_fail git format-patch --base=$(cat commit-id-P) -3 &&
+ 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
+'
+
+test_expect_success 'format-patch --base=auto' '
+ git checkout -b upstream master &&
+ git checkout -b local upstream &&
+ git branch --set-upstream-to=upstream &&
+ test_commit N1 &&
+ 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
+'
+
+test_expect_success 'format-patch errors out when history involves criss-cross' '
+ # setup criss-cross history
+ #
+ # B---M1---D
+ # / \ /
+ # A X
+ # \ / \
+ # C---M2---E
+ #
+ git checkout master &&
+ test_commit A &&
+ git checkout -b xb master &&
+ test_commit B &&
+ git checkout -b xc master &&
+ test_commit C &&
+ git checkout -b xbc xb -- &&
+ git merge xc &&
+ git checkout -b xcb xc -- &&
+ git branch --set-upstream-to=xbc &&
+ git merge xb &&
+ git checkout xbc &&
+ test_commit D &&
+ git checkout xcb &&
+ test_commit E &&
+ test_must_fail git format-patch --base=auto -1
+'
+
+test_expect_success 'format-patch format.useAutoBaseoption' '
+ test_when_finished "git config --unset format.useAutoBase" &&
+ git checkout local &&
+ git 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
+'
+
+test_expect_success 'format-patch --base overrides format.useAutoBase' '
+ test_when_finished "git config --unset format.useAutoBase" &&
+ git 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
+'
+
test_done
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 3b8b792..447a8ff 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -248,7 +248,8 @@ EOF
git rm -r src/move/unchanged &&
git rm -r src/move/changed &&
git rm -r src/move/rearranged &&
- git commit -m "changes"
+ git commit -m "changes" &&
+ git config diff.renames false
'
cat <<EOF >expect_diff_stat
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index ea5ace9..9473c27 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -82,7 +82,7 @@ test_expect_success 'am -3 --abort removes otherfile-4' '
test 4 = "$(cat otherfile-4)" &&
git am --abort &&
test_cmp_rev initial HEAD &&
- test -z $(git ls-files -u) &&
+ test -z "$(git ls-files -u)" &&
test_path_is_missing otherfile-4
'
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index ed9c91e..1a080e7 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -184,12 +184,27 @@ test_expect_success 'rerere updates postimage timestamp' '
'
test_expect_success 'rerere clear' '
- rm $rr/postimage &&
+ mv $rr/postimage .git/post-saved &&
echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
git rerere clear &&
! test -d $rr
'
+test_expect_success 'leftover directory' '
+ git reset --hard &&
+ mkdir -p $rr &&
+ test_must_fail git merge first &&
+ test -f $rr/preimage
+'
+
+test_expect_success 'missing preimage' '
+ git reset --hard &&
+ mkdir -p $rr &&
+ cp .git/post-saved $rr/postimage &&
+ test_must_fail git merge first &&
+ test -f $rr/preimage
+'
+
test_expect_success 'set up for garbage collection tests' '
mkdir -p $rr &&
echo Hello >$rr/preimage &&
@@ -391,4 +406,157 @@ test_expect_success 'rerere -h' '
test_i18ngrep [Uu]sage help
'
+concat_insert () {
+ last=$1
+ shift
+ cat early && printf "%s\n" "$@" && cat late "$last"
+}
+
+count_pre_post () {
+ find .git/rr-cache/ -type f -name "preimage*" >actual &&
+ test_line_count = "$1" actual &&
+ find .git/rr-cache/ -type f -name "postimage*" >actual &&
+ test_line_count = "$2" actual
+}
+
+test_expect_success 'rerere gc' '
+ find .git/rr-cache -type f >original &&
+ xargs test-chmtime -172800 <original &&
+
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ test_cmp original actual &&
+
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ test_cmp original actual &&
+
+ git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ >expect &&
+ test_cmp expect actual
+'
+
+merge_conflict_resolve () {
+ git reset --hard &&
+ test_must_fail git merge six.1 &&
+ # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
+ concat_insert short 6.1 6.2 >file1 &&
+ concat_insert long 6.1 6.2 >file2
+}
+
+test_expect_success 'multiple identical conflicts' '
+ git reset --hard &&
+
+ test_seq 1 6 >early &&
+ >late &&
+ test_seq 11 15 >short &&
+ test_seq 111 120 >long &&
+ concat_insert short >file1 &&
+ concat_insert long >file2 &&
+ git add file1 file2 &&
+ git commit -m base &&
+ git tag base &&
+ git checkout -b six.1 &&
+ concat_insert short 6.1 >file1 &&
+ concat_insert long 6.1 >file2 &&
+ git add file1 file2 &&
+ git commit -m 6.1 &&
+ git checkout -b six.2 HEAD^ &&
+ concat_insert short 6.2 >file1 &&
+ concat_insert long 6.2 >file2 &&
+ git add file1 file2 &&
+ git commit -m 6.2 &&
+
+ # At this point, six.1 and six.2
+ # - derive from common ancestor that has two files
+ # 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
+ # - six.1 replaces these 7s with 6.1
+ # - six.2 replaces these 7s with 6.2
+
+ merge_conflict_resolve &&
+
+ # Check that rerere knows that file1 and file2 have conflicts
+
+ printf "%s\n" file1 file2 >expect &&
+ git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
+ test_cmp expect actual &&
+
+ git rerere status | sort >actual &&
+ test_cmp expect actual &&
+
+ git rerere remaining >actual &&
+ test_cmp expect actual &&
+
+ count_pre_post 2 0 &&
+
+ # Pretend that the conflicts were made quite some time ago
+ find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+ # Unresolved entries have not expired yet
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+ count_pre_post 2 0 &&
+
+ # Unresolved entries have expired
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+ count_pre_post 0 0 &&
+
+ # Recreate the conflicted state
+ merge_conflict_resolve &&
+ count_pre_post 2 0 &&
+
+ # Clear it
+ git rerere clear &&
+ count_pre_post 0 0 &&
+
+ # Recreate the conflicted state
+ merge_conflict_resolve &&
+ count_pre_post 2 0 &&
+
+ # We resolved file1 and file2
+ git rerere &&
+ >expect &&
+ git rerere remaining >actual &&
+ test_cmp expect actual &&
+
+ # We must have recorded both of them
+ count_pre_post 2 2 &&
+
+ # Now we should be able to resolve them both
+ git reset --hard &&
+ test_must_fail git merge six.1 &&
+ git rerere &&
+
+ >expect &&
+ git rerere remaining >actual &&
+ test_cmp expect actual &&
+
+ concat_insert short 6.1 6.2 >file1.expect &&
+ concat_insert long 6.1 6.2 >file2.expect &&
+ test_cmp file1.expect file1 &&
+ test_cmp file2.expect file2 &&
+
+ # Forget resolution for file2
+ git rerere forget file2 &&
+ echo file2 >expect &&
+ git rerere status >actual &&
+ test_cmp expect actual &&
+ count_pre_post 2 1 &&
+
+ # file2 already has correct resolution, so record it again
+ git rerere &&
+
+ # Pretend that the resolutions are old again
+ find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+ # Resolved entries have not expired yet
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+
+ count_pre_post 2 2 &&
+
+ # Resolved entries have expired
+ git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
+ count_pre_post 0 0
+'
+
test_done
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index f5e6367..a977365 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -115,7 +115,7 @@ EOF
'
test_expect_success !MINGW 'shortlog from non-git directory' '
- git log HEAD >log &&
+ git log --no-expand-tabs HEAD >log &&
GIT_DIR=non-existing git shortlog -w <log >out &&
test_cmp expect out
'
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index cb82eb7..128ba93 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -101,8 +101,8 @@ test_expect_success 'oneline' '
test_expect_success 'diff-filter=A' '
- git log --pretty="format:%s" --diff-filter=A HEAD > actual &&
- git log --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
+ git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
+ git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
printf "fifth\nfourth\nthird\ninitial" > expect &&
test_cmp expect actual &&
test_cmp expect actual-separate
@@ -119,7 +119,7 @@ test_expect_success 'diff-filter=M' '
test_expect_success 'diff-filter=D' '
- actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
+ actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
expect=$(echo sixth ; echo third) &&
verbose test "$actual" = "$expect"
@@ -848,7 +848,7 @@ sanitize_output () {
}
test_expect_success 'log --graph with diff and stats' '
- git log --graph --pretty=short --stat -p >actual &&
+ git log --no-renames --graph --pretty=short --stat -p >actual &&
sanitize_output >actual.sanitized <actual &&
test_i18ncmp expect actual.sanitized
'
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index baa9d3c..84a8096 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' '
#calculate patch id. Make sure output is not empty.
calc_patch_id () {
- name="$1"
+ patch_name="$1"
shift
git patch-id "$@" |
- sed "s/ .*//" >patch-id_"$name" &&
- test_line_count -gt 0 patch-id_"$name"
+ sed "s/ .*//" >patch-id_"$patch_name" &&
+ test_line_count -gt 0 patch-id_"$patch_name"
}
get_top_diff () {
diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh
new file mode 100755
index 0000000..e01a8f6
--- /dev/null
+++ b/t/t4213-log-tabexpand.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+test_description='log/show --expand-tabs'
+
+. ./test-lib.sh
+
+HT=" "
+title='tab indent at the beginning of the title line'
+body='tab indent on a line in the body'
+
+# usage: count_expand $indent $numSP $numHT @format_args
+count_expand ()
+{
+ expect=
+ count=$(( $1 + $2 )) ;# expected spaces
+ while test $count -gt 0
+ do
+ expect="$expect "
+ count=$(( $count - 1 ))
+ done
+ shift 2
+ count=$1 ;# expected tabs
+ while test $count -gt 0
+ do
+ expect="$expect$HT"
+ count=$(( $count - 1 ))
+ done
+ shift
+
+ # The remainder of the command line is "git show -s" options
+ case " $* " in
+ *' --pretty=short '*)
+ line=$title ;;
+ *)
+ line=$body ;;
+ esac
+
+ # Prefix the output with the command line arguments, and
+ # replace SP with a dot both in the expecte and actual output
+ # so that test_cmp would show the differene together with the
+ # breakage in a way easier to consume by the debugging user.
+ {
+ echo "git show -s $*"
+ echo "$expect$line"
+ } | sed -e 's/ /./g' >expect
+
+ {
+ echo "git show -s $*"
+ git show -s "$@" |
+ sed -n -e "/$line\$/p"
+ } | sed -e 's/ /./g' >actual
+
+ test_cmp expect actual
+}
+
+test_expand ()
+{
+ fmt=$1
+ case "$fmt" in
+ *=raw | *=short | *=email)
+ default="0 1" ;;
+ *)
+ default="8 0" ;;
+ esac
+ case "$fmt" in
+ *=email)
+ in=0 ;;
+ *)
+ in=4 ;;
+ esac
+ test_expect_success "expand/no-expand${fmt:+ for $fmt}" '
+ count_expand $in $default $fmt &&
+ count_expand $in 8 0 $fmt --expand-tabs &&
+ count_expand $in 8 0 --expand-tabs $fmt &&
+ count_expand $in 8 0 $fmt --expand-tabs=8 &&
+ count_expand $in 8 0 --expand-tabs=8 $fmt &&
+ count_expand $in 0 1 $fmt --no-expand-tabs &&
+ count_expand $in 0 1 --no-expand-tabs $fmt &&
+ count_expand $in 0 1 $fmt --expand-tabs=0 &&
+ count_expand $in 0 1 --expand-tabs=0 $fmt &&
+ count_expand $in 4 0 $fmt --expand-tabs=4 &&
+ count_expand $in 4 0 --expand-tabs=4 $fmt
+ '
+}
+
+test_expect_success 'setup' '
+ test_tick &&
+ sed -e "s/Q/$HT/g" <<-EOF >msg &&
+ Q$title
+
+ Q$body
+ EOF
+ git commit --allow-empty -F msg
+'
+
+test_expand ""
+test_expand --pretty
+test_expand --pretty=short
+test_expand --pretty=medium
+test_expand --pretty=full
+test_expand --pretty=fuller
+test_expand --pretty=raw
+test_expand --pretty=email
+
+test_done
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index fc2be63..899e52d 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -284,6 +284,12 @@ test_expect_success \
git index-pack test-3.pack &&
cmp test-3.idx test-3-${packname_3}.idx &&
+ cat test-1-${packname_1}.pack >test-4.pack &&
+ rm -f test-4.keep &&
+ git index-pack --keep=why test-4.pack &&
+ cmp test-1-${packname_1}.idx test-4.idx &&
+ test -f test-4.keep &&
+
:'
test_expect_success 'unpacking with --strict' '
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 04cea97..305ca7a 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -128,6 +128,18 @@ test_expect_success 'denyNonFastforwards trumps --force' '
test "$victim_orig" = "$victim_head"
'
+test_expect_success 'send-pack --all sends all branches' '
+ # make sure we have at least 2 branches with different
+ # values, just to be thorough
+ git branch other-branch HEAD^ &&
+
+ git init --bare all.git &&
+ git send-pack --all all.git &&
+ git for-each-ref refs/heads >expect &&
+ git -C all.git for-each-ref refs/heads >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'push --all excludes remote-tracking hierarchy' '
mkdir parent &&
(
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index e5f83bf..82d913a 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -259,7 +259,8 @@ test_expect_success 'clone shallow object count' '
test_expect_success 'pull in shallow repo with missing merge base' '
(
cd shallow &&
- test_must_fail git pull --depth 4 .. A
+ git fetch --depth 4 .. A
+ test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
)
'
@@ -279,9 +280,10 @@ test_expect_success 'clone shallow depth count' '
test_expect_success 'clone shallow object count' '
(
cd shallow &&
+ git prune &&
git count-objects -v
) > count.shallow &&
- grep "^count: 55" count.shallow
+ grep "^count: 54" count.shallow
'
test_expect_success 'fetch --no-shallow on full repo' '
@@ -531,6 +533,20 @@ test_expect_success 'shallow fetch with tags does not break the repository' '
git fsck
)
'
+
+test_expect_success 'fetch-pack can fetch a raw sha1' '
+ git init hidden &&
+ (
+ cd hidden &&
+ test_commit 1 &&
+ test_commit 2 &&
+ git update-ref refs/hidden/one HEAD^ &&
+ git config transfer.hiderefs refs/hidden &&
+ git config uploadpack.allowtipsha1inwant true
+ ) &&
+ git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
+'
+
check_prot_path () {
cat >expected <<-EOF &&
Diag: url=$1
@@ -542,7 +558,6 @@ check_prot_path () {
}
check_prot_host_port_path () {
- local diagport
case "$2" in
*ssh*)
pp=ssh
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index a3e12d2..44f3d5f 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' '
git config receive.fsckobjects true &&
git config transfer.fsckobjects false
) &&
- test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&
- {
- test_cmp exp act ||
- ! test -s act
- }
+ test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_cmp exp act
'
test_expect_success 'push with transfer.fsckobjects' '
@@ -114,7 +111,8 @@ test_expect_success 'push with transfer.fsckobjects' '
cd dst &&
git config transfer.fsckobjects true
) &&
- test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act
+ test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_cmp exp act
'
cat >bogus-commit <<\EOF
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 38321d1..454d896 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -682,6 +682,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
(
cd auto-gc &&
git config gc.autoPackLimit 1 &&
+ git config gc.autoDetach false &&
GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
! grep "Should I try again" fetch.out
)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c952d5e..739c089 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -9,6 +9,24 @@ modify () {
mv "$2.x" "$2"
}
+test_pull_autostash () {
+ git reset --hard before-rebase &&
+ echo dirty >new_file &&
+ git add new_file &&
+ git pull "$@" . copy &&
+ test_cmp_rev HEAD^ copy &&
+ test "$(cat new_file)" = dirty &&
+ test "$(cat file)" = "modified again"
+}
+
+test_pull_autostash_fail () {
+ git reset --hard before-rebase &&
+ echo dirty >new_file &&
+ git add new_file &&
+ test_must_fail git pull "$@" . copy 2>err &&
+ test_i18ngrep "uncommitted changes." err
+}
+
test_expect_success setup '
echo file >file &&
git add file &&
@@ -247,15 +265,47 @@ test_expect_success '--rebase fails with multiple branches' '
test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
test_config rebase.autostash true &&
- git reset --hard before-rebase &&
- echo dirty >new_file &&
- git add new_file &&
- git pull --rebase . copy &&
- test_cmp_rev HEAD^ copy &&
- test "$(cat new_file)" = dirty &&
- test "$(cat file)" = "modified again"
+ test_pull_autostash --rebase
'
+test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
+ test_config rebase.autostash true &&
+ test_pull_autostash --rebase --autostash
+'
+
+test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
+ test_config rebase.autostash false &&
+ test_pull_autostash --rebase --autostash
+'
+
+test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
+ test_unconfig rebase.autostash &&
+ test_pull_autostash --rebase --autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
+ test_config rebase.autostash true &&
+ test_pull_autostash_fail --rebase --no-autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
+ test_config rebase.autostash false &&
+ test_pull_autostash_fail --rebase --no-autostash
+'
+
+test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
+ test_unconfig rebase.autostash &&
+ test_pull_autostash_fail --rebase --no-autostash
+'
+
+for i in --autostash --no-autostash
+do
+ test_expect_success "pull $i (without --rebase) is illegal" '
+ test_must_fail git pull $i . copy 2>err &&
+ test_i18ngrep "only valid with --rebase" err
+ '
+done
+
test_expect_success 'pull.rebase' '
git reset --hard before-rebase &&
test_config pull.rebase true &&
@@ -264,6 +314,16 @@ test_expect_success 'pull.rebase' '
test new = "$(git show HEAD:file2)"
'
+test_expect_success 'pull --autostash & pull.rebase=true' '
+ test_config pull.rebase true &&
+ test_pull_autostash --autostash
+'
+
+test_expect_success 'pull --no-autostash & pull.rebase=true' '
+ test_config pull.rebase true &&
+ test_pull_autostash_fail --no-autostash
+'
+
test_expect_success 'branch.to-rebase.rebase' '
git reset --hard before-rebase &&
test_config branch.to-rebase.rebase true &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 18372ca..ded8f98 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -144,4 +144,25 @@ test_expect_success 'git pull --all --dry-run' '
)
'
+test_expect_success 'git pull --allow-unrelated-histories' '
+ test_when_finished "rm -fr src dst" &&
+ git init src &&
+ (
+ cd src &&
+ test_commit one &&
+ test_commit two
+ ) &&
+ git clone src dst &&
+ (
+ cd src &&
+ git checkout --orphan side HEAD^ &&
+ test_commit three
+ ) &&
+ (
+ cd dst &&
+ test_must_fail git pull ../src side &&
+ git pull --allow-unrelated-histories ../src side
+ )
+'
+
test_done
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 1241146..954d0e4 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -471,4 +471,18 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
test_i18ncmp expect.err actual.err
'
+test_expect_success 'fetching submodules respects parallel settings' '
+ git config fetch.recurseSubmodules true &&
+ (
+ cd downstream &&
+ GIT_TRACE=$(pwd)/trace.out git fetch --jobs 7 &&
+ grep "7 tasks" trace.out &&
+ git config submodule.fetchJobs 8 &&
+ GIT_TRACE=$(pwd)/trace.out git fetch &&
+ grep "8 tasks" trace.out &&
+ GIT_TRACE=$(pwd)/trace.out git fetch --jobs 9 &&
+ grep "9 tasks" trace.out
+ )
+'
+
test_done
diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh
index d75ef0e..51c9669 100755
--- a/t/t5532-fetch-proxy.sh
+++ b/t/t5532-fetch-proxy.sh
@@ -12,10 +12,8 @@ test_expect_success 'setup remote repo' '
)
'
-cat >proxy <<'EOF'
-#!/bin/sh
-echo >&2 "proxying for $*"
-cmd=$("$PERL_PATH" -e '
+test_expect_success 'setup proxy script' '
+ write_script proxy-get-cmd "$PERL_PATH" <<-\EOF &&
read(STDIN, $buf, 4);
my $n = hex($buf) - 4;
read(STDIN, $buf, $n);
@@ -23,11 +21,16 @@ cmd=$("$PERL_PATH" -e '
# drop absolute-path on repo name
$cmd =~ s{ /}{ };
print $cmd;
-')
-echo >&2 "Running '$cmd'"
-exec $cmd
-EOF
-chmod +x proxy
+ EOF
+
+ write_script proxy <<-\EOF
+ echo >&2 "proxying for $*"
+ cmd=$(./proxy-get-cmd)
+ echo >&2 "Running $cmd"
+ exec $cmd
+ EOF
+'
+
test_expect_success 'setup local repo' '
git remote add fake git://example.com/remote &&
git config core.gitproxy ./proxy
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 6414635..3484b6f 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -91,6 +91,55 @@ test_expect_success 'configured username does not override URL' '
expect_askpass pass user@host
'
+test_expect_success 'set up repo with http submodules' '
+ git init super &&
+ set_askpass user@host pass@host &&
+ (
+ cd super &&
+ git submodule add "$HTTPD_URL/auth/dumb/repo.git" sub &&
+ git commit -m "add submodule"
+ )
+'
+
+test_expect_success 'cmdline credential config passes to submodule via clone' '
+ set_askpass wrong pass@host &&
+ test_must_fail git clone --recursive super super-clone &&
+ rm -rf super-clone &&
+
+ set_askpass wrong pass@host &&
+ git -c "credential.$HTTPD_URL.username=user@host" \
+ clone --recursive super super-clone &&
+ expect_askpass pass user@host
+'
+
+test_expect_success 'cmdline credential config passes submodule via fetch' '
+ set_askpass wrong pass@host &&
+ test_must_fail git -C super-clone fetch --recurse-submodules &&
+
+ set_askpass wrong pass@host &&
+ git -C super-clone \
+ -c "credential.$HTTPD_URL.username=user@host" \
+ fetch --recurse-submodules &&
+ expect_askpass pass user@host
+'
+
+test_expect_success 'cmdline credential config passes submodule update' '
+ # advance the submodule HEAD so that a fetch is required
+ git commit --allow-empty -m foo &&
+ git push "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git" HEAD &&
+ sha1=$(git rev-parse HEAD) &&
+ git -C super-clone update-index --cacheinfo 160000,$sha1,sub &&
+
+ set_askpass wrong pass@host &&
+ test_must_fail git -C super-clone submodule update &&
+
+ set_askpass wrong pass@host &&
+ git -C super-clone \
+ -c "credential.$HTTPD_URL.username=user@host" \
+ submodule update &&
+ expect_askpass pass user@host
+'
+
test_expect_success 'fetch changes via http' '
echo content >>file &&
git commit -a -m two &&
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 58207d8..2f375eb 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -282,5 +282,22 @@ test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
test_line_count = 100000 tags
'
+test_expect_success 'custom http headers' '
+ test_must_fail git -c http.extraheader="x-magic-two: cadabra" \
+ fetch "$HTTPD_URL/smart_headers/repo.git" &&
+ git -c http.extraheader="x-magic-one: abra" \
+ -c http.extraheader="x-magic-two: cadabra" \
+ fetch "$HTTPD_URL/smart_headers/repo.git" &&
+ git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+ git config -f .gitmodules submodule.sub.path sub &&
+ git config -f .gitmodules submodule.sub.url \
+ "$HTTPD_URL/smart_headers/repo.git" &&
+ git submodule init sub &&
+ test_must_fail git submodule update sub &&
+ git -c http.extraheader="x-magic-one: abra" \
+ -c http.extraheader="x-magic-two: cadabra" \
+ submodule update sub
+'
+
stop_httpd
test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index c1efb8e..a433394 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -308,7 +308,7 @@ test_expect_success 'clone checking out a tag' '
setup_ssh_wrapper () {
test_expect_success 'setup ssh wrapper' '
- cp "$GIT_BUILD_DIR/test-fake-ssh$X" \
+ cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
"$TRASH_DIRECTORY/ssh-wrapper$X" &&
GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
export GIT_SSH &&
@@ -466,7 +466,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
#IPv6
for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
do
- ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
+ ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "[]")
test_expect_success "clone ssh://$tuah/home/user/repo" "
test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
"
diff --git a/t/t5700-clone-reference.sh b/t/t5604-clone-reference.sh
index 4320082..4320082 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
diff --git a/t/t5701-clone-local.sh b/t/t5605-clone-local.sh
index 3c087e9..3c087e9 100755
--- a/t/t5701-clone-local.sh
+++ b/t/t5605-clone-local.sh
diff --git a/t/t5702-clone-options.sh b/t/t5606-clone-options.sh
index 9e24ec8..9e24ec8 100755
--- a/t/t5702-clone-options.sh
+++ b/t/t5606-clone-options.sh
diff --git a/t/t5704-bundle.sh b/t/t5607-clone-bundle.sh
index 348d9b3..348d9b3 100755
--- a/t/t5704-bundle.sh
+++ b/t/t5607-clone-bundle.sh
diff --git a/t/t5705-clone-2gb.sh b/t/t5608-clone-2gb.sh
index 191d6d3..191d6d3 100755
--- a/t/t5705-clone-2gb.sh
+++ b/t/t5608-clone-2gb.sh
diff --git a/t/t5706-clone-branch.sh b/t/t5609-clone-branch.sh
index 6e7a7be..6e7a7be 100755
--- a/t/t5706-clone-branch.sh
+++ b/t/t5609-clone-branch.sh
diff --git a/t/t5707-clone-detached.sh b/t/t5610-clone-detached.sh
index 8b0d607..8b0d607 100755
--- a/t/t5707-clone-detached.sh
+++ b/t/t5610-clone-detached.sh
diff --git a/t/t5708-clone-config.sh b/t/t5611-clone-config.sh
index 27d730c..e4850b7 100755
--- a/t/t5708-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -37,4 +37,24 @@ test_expect_success 'clone -c config is available during clone' '
test_cmp expect child/file
'
+# Tests for the hidden file attribute on windows
+is_hidden () {
+ # Use the output of `attrib`, ignore the absolute path
+ case "$(attrib "$1")" in *H*?:*) return 0;; esac
+ return 1
+}
+
+test_expect_success MINGW 'clone -c core.hideDotFiles' '
+ test_commit attributes .gitattributes "" &&
+ rm -rf child &&
+ git clone -c core.hideDotFiles=false . child &&
+ ! is_hidden child/.gitattributes &&
+ rm -rf child &&
+ git clone -c core.hideDotFiles=dotGitOnly . child &&
+ ! is_hidden child/.gitattributes &&
+ rm -rf child &&
+ git clone -c core.hideDotFiles=true . child &&
+ is_hidden child/.gitattributes
+'
+
test_done
diff --git a/t/t5709-clone-refspec.sh b/t/t5612-clone-refspec.sh
index 7ace253..7ace253 100755
--- a/t/t5709-clone-refspec.sh
+++ b/t/t5612-clone-refspec.sh
diff --git a/t/t5710-info-alternate.sh b/t/t5613-info-alternate.sh
index 9cd2626..9cd2626 100755
--- a/t/t5710-info-alternate.sh
+++ b/t/t5613-info-alternate.sh
diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh
new file mode 100755
index 0000000..62044c5
--- /dev/null
+++ b/t/t5614-clone-submodules.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+test_description='Test shallow cloning of repos with submodules'
+
+. ./test-lib.sh
+
+pwd=$(pwd)
+
+test_expect_success 'setup' '
+ git checkout -b master &&
+ test_commit commit1 &&
+ test_commit commit2 &&
+ mkdir sub &&
+ (
+ cd sub &&
+ git init &&
+ test_commit subcommit1 &&
+ test_commit subcommit2 &&
+ test_commit subcommit3
+ ) &&
+ git submodule add "file://$pwd/sub" sub &&
+ git commit -m "add submodule"
+'
+
+test_expect_success 'nonshallow clone implies nonshallow submodule' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ )
+'
+
+test_expect_success 'shallow clone implies shallow submodule' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 2 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines
+ )
+'
+
+test_expect_success 'shallow clone with non shallow submodule' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 2 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ )
+'
+
+test_expect_success 'non shallow clone with shallow submodule' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone &&
+ git log --oneline >lines &&
+ test_line_count = 3 lines
+ ) &&
+ (
+ cd super_clone/sub &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines
+ )
+'
+
+test_done
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 66cda17..20e3e25 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -47,7 +47,9 @@ test_expect_success 'setup roots, merges and octopuses' '
git checkout -b yetanotherbranch four &&
test_commit eight &&
git checkout master &&
- test_merge normalmerge newroot &&
+ test_tick &&
+ git merge --allow-unrelated-histories -m normalmerge newroot &&
+ git tag normalmerge &&
test_tick &&
git merge -m tripus sidebranch anotherbranch &&
git tag tripus &&
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index 39b3238..e0c5f44 100755
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -215,11 +215,13 @@ test_expect_success 'criss-cross merge-base for octopus-step' '
git reset --hard E &&
test_commit CC2 &&
test_tick &&
- git merge -s ours CC1 &&
+ # E is a root commit unrelated to MMR root on which CC1 is based
+ git merge -s ours --allow-unrelated-histories CC1 &&
test_commit CC-o &&
test_commit CCB &&
git reset --hard CC1 &&
- git merge -s ours CC2 &&
+ # E is a root commit unrelated to MMR root on which CC1 is based
+ git merge -s ours --allow-unrelated-histories CC2 &&
test_commit CCA &&
git rev-parse CC1 CC2 >expected &&
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index b89cd6b..2a0fbb8 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -71,7 +71,7 @@ test_expect_success setup '
note J &&
git checkout master &&
- test_tick && git merge -m "Coolest" unrelated &&
+ test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
note K &&
echo "Immaterial" >elif &&
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 755d30c..3f59e58 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -76,7 +76,7 @@ test_expect_success "result contains a conflict" "test_cmp expect a1"
git ls-files --stage > out
cat > expect << EOF
-100644 439cc46de773d8a83c77799b7cc9191c128bfcff 1 a1
+100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1
100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 04c0509..ef0cbce 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -176,7 +176,8 @@ test_expect_success 'up-to-date merge without common ancestor' '
test_tick &&
(
cd repo1 &&
- git pull ../repo2 master
+ git fetch ../repo2 master &&
+ git merge --allow-unrelated-histories FETCH_HEAD
)
'
diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
index 73fc240..3e69245 100755
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6029-merge-subtree.sh
@@ -49,7 +49,7 @@ test_expect_success 'setup' '
test_expect_success 'initial merge' '
git remote add -f gui ../git-gui &&
- git merge -s ours --no-commit gui/master &&
+ git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
git read-tree --prefix=git-gui/ -u gui/master &&
git commit -m "Merge git-gui as our subdirectory" &&
git checkout -b work &&
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 9d6621c..18aa88b 100755
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -212,7 +212,8 @@ test_expect_success 'git detects differently handled merges conflict' '
-L "" \
-L "Temporary merge branch 1" \
merged empty merge-me &&
- test $(git rev-parse :1:new_a) = $(git hash-object merged)
+ sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
+ test $(git rev-parse :1:new_a) = $(git hash-object merged-internal)
'
#
@@ -299,89 +300,6 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
'
#
-# criss-cross + modify/modify with very contrived file contents:
-#
-# B D
-# o---o
-# / \ / \
-# A o X ? F
-# \ / \ /
-# o---o
-# C E
-#
-# Commit A: file with contents 'A\n'
-# Commit B: file with contents 'B\n'
-# Commit C: file with contents 'C\n'
-# Commit D: file with contents 'D\n'
-# Commit E: file with contents:
-# <<<<<<< Temporary merge branch 1
-# C
-# =======
-# B
-# >>>>>>> Temporary merge branch 2
-#
-# Now, when we merge commits D & E, does git detect the conflict?
-
-test_expect_success 'setup differently handled merges of content conflict' '
- git clean -fdqx &&
- rm -rf .git &&
- git init &&
-
- echo A >file &&
- git add file &&
- test_tick &&
- git commit -m A &&
-
- git branch B &&
- git checkout -b C &&
- echo C >file &&
- git add file &&
- test_tick &&
- git commit -m C &&
-
- git checkout B &&
- echo B >file &&
- git add file &&
- test_tick &&
- git commit -m B &&
-
- git checkout B^0 &&
- test_must_fail git merge C &&
- echo D >file &&
- git add file &&
- test_tick &&
- git commit -m D &&
- git tag D &&
-
- git checkout C^0 &&
- test_must_fail git merge B &&
- cat <<EOF >file &&
-<<<<<<< Temporary merge branch 1
-C
-=======
-B
->>>>>>> Temporary merge branch 2
-EOF
- git add file &&
- test_tick &&
- git commit -m E &&
- git tag E
-'
-
-test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '
- git checkout D^0 &&
-
- test_must_fail git merge -s recursive E^0 &&
-
- test 3 -eq $(git ls-files -s | wc -l) &&
- test 3 -eq $(git ls-files -u | wc -l) &&
- test 0 -eq $(git ls-files -o | wc -l) &&
-
- test $(git rev-parse :2:file) = $(git rev-parse D:file) &&
- test $(git rev-parse :3:file) = $(git rev-parse E:file)
-'
-
-#
# criss-cross + d/f conflict via add/add:
# Commit A: Neither file 'a' nor directory 'a/' exists.
# Commit B: Introduce 'a'
diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
index c6b7aa6..62b8a2e 100755
--- a/t/t6041-bisect-submodule.sh
+++ b/t/t6041-bisect-submodule.sh
@@ -8,7 +8,7 @@ test_description='bisect can handle submodules'
git_bisect () {
git status -su >expect &&
ls -1pR * >>expect &&
- tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
+ tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
GOOD=$(git rev-parse --verify HEAD) &&
git checkout "$1" &&
echo "foo" >bar &&
@@ -20,7 +20,7 @@ git_bisect () {
git bisect start &&
git bisect good $GOOD &&
rm -rf * &&
- tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
+ tar xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
new file mode 100755
index 0000000..0102348
--- /dev/null
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+test_description="merges with unrelated index changes"
+
+. ./test-lib.sh
+
+# Testcase for some simple merges
+# A
+# o-----o B
+# \
+# \---o C
+# \
+# \-o D
+# \
+# o E
+# Commit A: some file a
+# Commit B: adds file b, modifies end of a
+# Commit C: adds file c
+# Commit D: adds file d, modifies beginning of a
+# Commit E: renames a->subdir/a, adds subdir/e
+
+test_expect_success 'setup trivial merges' '
+ test_seq 1 10 >a &&
+ git add a &&
+ test_tick && git commit -m A &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+ git branch D &&
+ git branch E &&
+
+ git checkout B &&
+ echo b >b &&
+ echo 11 >>a &&
+ git add a b &&
+ test_tick && git commit -m B &&
+
+ git checkout C &&
+ echo c >c &&
+ git add c &&
+ test_tick && git commit -m C &&
+
+ git checkout D &&
+ test_seq 2 10 >a &&
+ echo d >d &&
+ git add a d &&
+ test_tick && git commit -m D &&
+
+ git checkout E &&
+ mkdir subdir &&
+ git mv a subdir/a &&
+ echo e >subdir/e &&
+ git add subdir &&
+ test_tick && git commit -m E
+'
+
+test_expect_success 'ff update' '
+ git reset --hard &&
+ git checkout A^0 &&
+
+ touch random_file && git add random_file &&
+
+ git merge E^0 &&
+
+ test_must_fail git rev-parse HEAD:random_file &&
+ test "$(git diff --name-only --cached E)" = "random_file"
+'
+
+test_expect_success 'ff update, important file modified' '
+ git reset --hard &&
+ git checkout A^0 &&
+
+ mkdir subdir &&
+ touch subdir/e &&
+ git add subdir/e &&
+
+ test_must_fail git merge E^0
+'
+
+test_expect_success 'resolve, trivial' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s resolve C^0
+'
+
+test_expect_success 'resolve, non-trivial' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s resolve D^0
+'
+
+test_expect_success 'recursive' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s recursive C^0
+'
+
+test_expect_success 'octopus, unrelated file touched' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'octopus, related file removed' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ git rm b &&
+
+ test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'octopus, related file modified' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ echo 12 >>a && git add a &&
+
+ test_must_fail git merge C^0 D^0
+'
+
+test_expect_success 'ours' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s ours C^0
+'
+
+test_expect_success 'subtree' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s subtree E^0
+'
+
+test_done
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 10b1452..1c6952d 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
git checkout --orphan tmp &&
test_commit start2 &&
git checkout master &&
- git merge -m next start2 &&
+ git merge -m next --allow-unrelated-histories start2 &&
test_commit final &&
test_seq 40 |
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index bcf472b..d0ab09f 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -5,20 +5,27 @@ test_description='test for-each-refs usage of ref-filter APIs'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
-if ! test_have_prereq GPG
-then
- skip_all="skipping for-each-ref tests, GPG not available"
- test_done
-fi
-
test_expect_success 'setup some history and refs' '
test_commit one &&
test_commit two &&
test_commit three &&
git checkout -b side &&
test_commit four &&
- git tag -s -m "A signed tag message" signed-tag &&
- git tag -s -m "Annonated doubly" double-tag signed-tag &&
+ git tag -m "An annotated tag" annotated-tag &&
+ git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
+
+ # Note that these "signed" tags might not actually be signed.
+ # Tests which care about the distinction should be marked
+ # with the GPG prereq.
+ if test_have_prereq GPG
+ then
+ sign=-s
+ else
+ sign=
+ fi &&
+ git tag $sign -m "A signed tag" signed-tag &&
+ git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
+
git checkout master &&
git update-ref refs/odd/spot master
'
@@ -36,6 +43,7 @@ test_expect_success 'filtering with --points-at' '
test_expect_success 'check signed tags with --points-at' '
sed -e "s/Z$//" >expect <<-\EOF &&
refs/heads/side Z
+ refs/tags/annotated-tag four
refs/tags/four Z
refs/tags/signed-tag four
EOF
@@ -58,7 +66,9 @@ test_expect_success 'filtering with --merged' '
test_expect_success 'filtering with --no-merged' '
cat >expect <<-\EOF &&
refs/heads/side
- refs/tags/double-tag
+ refs/tags/annotated-tag
+ refs/tags/doubly-annotated-tag
+ refs/tags/doubly-signed-tag
refs/tags/four
refs/tags/signed-tag
EOF
@@ -71,7 +81,9 @@ test_expect_success 'filtering with --contains' '
refs/heads/master
refs/heads/side
refs/odd/spot
- refs/tags/double-tag
+ refs/tags/annotated-tag
+ refs/tags/doubly-annotated-tag
+ refs/tags/doubly-signed-tag
refs/tags/four
refs/tags/signed-tag
refs/tags/three
@@ -90,7 +102,9 @@ test_expect_success 'left alignment is default' '
refname is refs/heads/master |refs/heads/master
refname is refs/heads/side |refs/heads/side
refname is refs/odd/spot |refs/odd/spot
- refname is refs/tags/double-tag|refs/tags/double-tag
+ refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+ refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+ refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
refname is refs/tags/four |refs/tags/four
refname is refs/tags/one |refs/tags/one
refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -106,7 +120,9 @@ test_expect_success 'middle alignment' '
| refname is refs/heads/master |refs/heads/master
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
- |refname is refs/tags/double-tag|refs/tags/double-tag
+ |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+ |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+ |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
| refname is refs/tags/four |refs/tags/four
| refname is refs/tags/one |refs/tags/one
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -122,7 +138,9 @@ test_expect_success 'right alignment' '
| refname is refs/heads/master|refs/heads/master
| refname is refs/heads/side|refs/heads/side
| refname is refs/odd/spot|refs/odd/spot
- |refname is refs/tags/double-tag|refs/tags/double-tag
+ |refname is refs/tags/annotated-tag|refs/tags/annotated-tag
+ |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag
+ |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag
| refname is refs/tags/four|refs/tags/four
| refname is refs/tags/one|refs/tags/one
|refname is refs/tags/signed-tag|refs/tags/signed-tag
@@ -137,7 +155,9 @@ cat >expect <<-\EOF
| refname is refs/heads/master |refs/heads/master
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
-| refname is refs/tags/double-tag |refs/tags/double-tag
+| refname is refs/tags/annotated-tag |refs/tags/annotated-tag
+|refname is refs/tags/doubly-annotated-tag |refs/tags/doubly-annotated-tag
+| refname is refs/tags/doubly-signed-tag |refs/tags/doubly-signed-tag
| refname is refs/tags/four |refs/tags/four
| refname is refs/tags/one |refs/tags/one
| refname is refs/tags/signed-tag |refs/tags/signed-tag
@@ -182,7 +202,9 @@ test_expect_success 'alignment with format quote' "
|' '\''master| A U Thor'\'' '|
|' '\''side| A U Thor'\'' '|
|' '\''odd/spot| A U Thor'\'' '|
- |' '\''double-tag| '\'' '|
+ |' '\''annotated-tag| '\'' '|
+ |' '\''doubly-annotated-tag| '\'' '|
+ |' '\''doubly-signed-tag| '\'' '|
|' '\''four| A U Thor'\'' '|
|' '\''one| A U Thor'\'' '|
|' '\''signed-tag| '\'' '|
@@ -198,7 +220,9 @@ test_expect_success 'nested alignment with quote formatting' "
|' master '|
|' side '|
|' odd/spot '|
- |' double-tag '|
+ |' annotated-tag '|
+ |'doubly-annotated-tag '|
+ |'doubly-signed-tag '|
|' four '|
|' one '|
|' signed-tag '|
@@ -214,10 +238,12 @@ test_expect_success 'check `%(contents:lines=1)`' '
master |three
side |four
odd/spot |three
- double-tag |Annonated doubly
+ annotated-tag |An annotated tag
+ doubly-annotated-tag |Annonated doubly
+ doubly-signed-tag |Signed doubly
four |four
one |one
- signed-tag |A signed tag message
+ signed-tag |A signed tag
three |three
two |two
EOF
@@ -230,7 +256,9 @@ test_expect_success 'check `%(contents:lines=0)`' '
master |
side |
odd/spot |
- double-tag |
+ annotated-tag |
+ doubly-annotated-tag |
+ doubly-signed-tag |
four |
one |
signed-tag |
@@ -246,10 +274,12 @@ test_expect_success 'check `%(contents:lines=99999)`' '
master |three
side |four
odd/spot |three
- double-tag |Annonated doubly
+ annotated-tag |An annotated tag
+ doubly-annotated-tag |Annonated doubly
+ doubly-signed-tag |Signed doubly
four |four
one |one
- signed-tag |A signed tag message
+ signed-tag |A signed tag
three |three
two |two
EOF
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4008fae..4a2570e 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -292,6 +292,9 @@ test_expect_success 'setup submodule' '
echo content >file &&
git add file &&
git commit -m "added sub and file" &&
+ mkdir -p deep/directory/hierachy &&
+ git submodule add ./. deep/directory/hierachy/sub &&
+ git commit -m "added another submodule" &&
git branch submodule
'
@@ -475,4 +478,17 @@ test_expect_success 'mv -k does not accidentally destroy submodules' '
git checkout .
'
+test_expect_success 'moving a submodule in nested directories' '
+ (
+ cd deep &&
+ git mv directory ../ &&
+ # git status would fail if the update of linking git dir to
+ # work dir of the submodule failed.
+ git status &&
+ git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
+ echo "directory/hierachy/sub" >../expect
+ ) &&
+ test_cmp actual expect
+'
+
test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index cf3469b..f9b7d79 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -775,6 +775,47 @@ test_expect_success GPG '-s implies annotated tag' '
test_cmp expect actual
'
+get_tag_header forcesignannotated-implied-sign $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+ 'git tag -s implied if configured with tag.forcesignannotated' \
+ 'test_config tag.forcesignannotated true &&
+ git tag -m "A message" forcesignannotated-implied-sign &&
+ get_tag_msg forcesignannotated-implied-sign >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success GPG \
+ 'lightweight with no message when configured with tag.forcesignannotated' \
+ 'test_config tag.forcesignannotated true &&
+ git tag forcesignannotated-lightweight &&
+ tag_exists forcesignannotated-lightweight &&
+ test_must_fail git tag -v forcesignannotated-no-message
+'
+
+get_tag_header forcesignannotated-annotate $commit commit $time >expect
+echo "A message" >>expect
+test_expect_success GPG \
+ 'git tag -a disable configured tag.forcesignannotated' \
+ 'test_config tag.forcesignannotated true &&
+ git tag -a -m "A message" forcesignannotated-annotate &&
+ get_tag_msg forcesignannotated-annotate >actual &&
+ test_cmp expect actual &&
+ test_must_fail git tag -v forcesignannotated-annotate
+'
+
+get_tag_header forcesignannotated-disabled $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+ 'git tag --sign enable GPG sign' \
+ 'test_config tag.forcesignannotated false &&
+ git tag --sign -m "A message" forcesignannotated-disabled &&
+ get_tag_msg forcesignannotated-disabled >actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG \
'trying to create a signed tag with non-existing -F file should fail' '
! test -f nonexistingfile &&
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 4608e71..07079a4 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -112,4 +112,17 @@ test_expect_success GPG 'verify signatures with --raw' '
)
'
+test_expect_success GPG 'verify multiple tags' '
+ tags="fourth-signed sixth-signed seventh-signed" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^.GNUPG:." <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^.GNUPG:." <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
test_done
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 86ceb38..b89fd2a 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -495,7 +495,7 @@ test_expect_success 'should not clean submodules' '
test_path_is_missing to_clean
'
-test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '
+test_expect_success POSIXPERM,SANITY 'should avoid cleaning possible submodules' '
rm -fr to_clean possible_sub1 &&
mkdir to_clean possible_sub1 &&
test_when_finished "rm -rf possible_sub*" &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e1abd19..3570f7b 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -11,6 +11,10 @@ subcommands of git submodule.
. ./test-lib.sh
+test_expect_success 'submodule deinit works on empty repository' '
+ git submodule deinit --all
+'
+
test_expect_success 'setup - initial commit' '
>t &&
git add t &&
@@ -18,6 +22,22 @@ test_expect_success 'setup - initial commit' '
git branch initial
'
+test_expect_success 'submodule init aborts on missing .gitmodules file' '
+ test_when_finished "git update-index --remove sub" &&
+ git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+ # missing the .gitmodules file here
+ test_must_fail git submodule init 2>actual &&
+ test_i18ngrep "No url found for submodule path" actual
+'
+
+test_expect_success 'submodule update aborts on missing .gitmodules file' '
+ test_when_finished "git update-index --remove sub" &&
+ git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+ # missing the .gitmodules file here
+ git submodule update sub 2>actual &&
+ test_i18ngrep "Submodule path .sub. not initialized" actual
+'
+
test_expect_success 'configuration parsing' '
test_when_finished "rm -f .gitmodules" &&
cat >.gitmodules <<-\EOF &&
@@ -462,7 +482,7 @@ test_expect_success 'update --init' '
git config --remove-section submodule.example &&
test_must_fail git config submodule.example.url &&
- git submodule update init > update.out &&
+ 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 &&
@@ -480,7 +500,7 @@ test_expect_success 'update --init from subdirectory' '
mkdir -p sub &&
(
cd sub &&
- git submodule update ../init >update.out &&
+ 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 &&
@@ -818,6 +838,47 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
)
'
+test_expect_success 'recursive relative submodules stay relative' '
+ test_when_finished "rm -rf super clone2 subsub sub3" &&
+ mkdir subsub &&
+ (
+ cd subsub &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit"
+ ) &&
+ mkdir sub3 &&
+ (
+ cd sub3 &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit" &&
+ git submodule add ../subsub dirdir/subsub &&
+ git commit -m "add submodule subsub"
+ ) &&
+ mkdir super &&
+ (
+ cd super &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit" &&
+ git submodule add ../sub3 &&
+ git commit -m "add submodule sub"
+ ) &&
+ git clone super clone2 &&
+ (
+ cd clone2 &&
+ git submodule update --init --recursive &&
+ echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
+ echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
+ ) &&
+ test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
+ test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
+'
+
test_expect_success 'submodule add with an existing name fails unless forced' '
(
cd addtest2 &&
@@ -857,8 +918,9 @@ test_expect_success 'submodule deinit works on repository without submodules' '
git init &&
>file &&
git add file &&
- git commit -m "repo should not be empty"
- git submodule deinit .
+ git commit -m "repo should not be empty" &&
+ git submodule deinit . &&
+ git submodule deinit --all
)
'
@@ -900,6 +962,19 @@ test_expect_success 'submodule deinit . deinits all initialized submodules' '
rmdir init example2
'
+test_expect_success 'submodule deinit --all deinits all initialized submodules' '
+ git submodule update --init &&
+ git config submodule.example.foo bar &&
+ git config submodule.example2.frotz nitfol &&
+ test_must_fail git submodule deinit &&
+ git submodule deinit --all >actual &&
+ test -z "$(git config --get-regexp "submodule\.example\.")" &&
+ test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+ test_i18ngrep "Cleared directory .init" actual &&
+ test_i18ngrep "Cleared directory .example2" actual &&
+ rmdir init example2
+'
+
test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' '
git submodule update --init &&
rm -rf init example2/* example2/.git &&
@@ -966,6 +1041,10 @@ test_expect_success 'submodule deinit is silent when used on an uninitialized su
test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
test_i18ngrep "Cleared directory .init" actual &&
+ git submodule deinit --all >actual &&
+ test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+ test_i18ngrep "Cleared directory .init" actual &&
rmdir init example2
'
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 79bc135..5503ec0 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
'
reset_submodule_urls () {
- local root
- root=$(pwd) &&
(
+ root=$(pwd) &&
cd super-clone/submodule &&
git config remote.origin.url "$root/submodule"
) &&
(
+ root=$(pwd) &&
cd super-clone/submodule/sub-submodule &&
git config remote.origin.url "$root/submodule"
)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 68ea31d..5f27879 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -63,6 +63,10 @@ test_expect_success 'setup a submodule tree' '
git submodule add ../none none &&
test_tick &&
git commit -m "none"
+ ) &&
+ git clone . recursivesuper &&
+ ( cd recursivesuper
+ git submodule add ../super super
)
'
@@ -95,6 +99,47 @@ test_expect_success 'submodule update from subdirectory' '
)
'
+supersha1=$(git -C super rev-parse HEAD)
+mergingsha1=$(git -C super/merging rev-parse HEAD)
+nonesha1=$(git -C super/none rev-parse HEAD)
+rebasingsha1=$(git -C super/rebasing rev-parse HEAD)
+submodulesha1=$(git -C super/submodule rev-parse HEAD)
+pwd=$(pwd)
+
+cat <<EOF >expect
+Submodule path '../super': checked out '$supersha1'
+Submodule path '../super/merging': checked out '$mergingsha1'
+Submodule path '../super/none': checked out '$nonesha1'
+Submodule path '../super/rebasing': checked out '$rebasingsha1'
+Submodule path '../super/submodule': checked out '$submodulesha1'
+EOF
+
+cat <<EOF >expect2
+Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
+Submodule 'none' ($pwd/none) registered for path '../super/none'
+Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
+Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
+Cloning into '$pwd/recursivesuper/super/merging'...
+done.
+Cloning into '$pwd/recursivesuper/super/none'...
+done.
+Cloning into '$pwd/recursivesuper/super/rebasing'...
+done.
+Cloning into '$pwd/recursivesuper/super/submodule'...
+done.
+EOF
+
+test_expect_success 'submodule update --init --recursive from subdirectory' '
+ git -C recursivesuper/super reset --hard HEAD^ &&
+ (cd recursivesuper &&
+ mkdir tmp &&
+ cd tmp &&
+ git submodule update --init --recursive ../super >../../actual 2>../../actual2
+ ) &&
+ test_cmp expect actual &&
+ test_cmp expect2 actual2
+'
+
apos="'";
test_expect_success 'submodule update does not fetch already present commits' '
(cd submodule &&
@@ -311,16 +356,59 @@ test_expect_success 'submodule update - command in .git/config' '
)
'
+cat << EOF >expect
+Execution of 'false $submodulesha1' failed in submodule path 'submodule'
+EOF
+
test_expect_success 'submodule update - command in .git/config catches failure' '
(cd super &&
git config submodule.submodule.update "!false"
) &&
(cd super/submodule &&
- git reset --hard HEAD^
+ git reset --hard $submodulesha1^
) &&
(cd super &&
- test_must_fail git submodule update submodule
- )
+ test_must_fail git submodule update submodule 2>../actual
+ ) &&
+ test_cmp actual expect
+'
+
+cat << EOF >expect
+Execution of 'false $submodulesha1' failed in submodule path '../submodule'
+EOF
+
+test_expect_success 'submodule update - command in .git/config catches failure -- subdirectory' '
+ (cd super &&
+ git config submodule.submodule.update "!false"
+ ) &&
+ (cd super/submodule &&
+ git reset --hard $submodulesha1^
+ ) &&
+ (cd super &&
+ mkdir tmp && cd tmp &&
+ test_must_fail git submodule update ../submodule 2>../../actual
+ ) &&
+ test_cmp actual expect
+'
+
+cat << EOF >expect
+Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
+Failed to recurse into submodule path '../super'
+EOF
+
+test_expect_success 'recursive submodule update - command in .git/config catches failure -- subdirectory' '
+ (cd recursivesuper &&
+ git submodule update --remote super &&
+ git add super &&
+ git commit -m "update to latest to have more than one commit in submodules"
+ ) &&
+ git -C recursivesuper/super config submodule.submodule.update "!false" &&
+ git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
+ (cd recursivesuper &&
+ mkdir -p tmp && cd tmp &&
+ test_must_fail git submodule update --recursive ../super 2>../../actual
+ ) &&
+ test_cmp actual expect
'
test_expect_success 'submodule init does not copy command into .git/config' '
@@ -774,4 +862,31 @@ test_expect_success 'submodule update --recursive drops module name before recur
test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
)
'
+
+test_expect_success 'submodule update can be run in parallel' '
+ (cd super2 &&
+ GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
+ grep "7 tasks" trace.out &&
+ git config submodule.fetchJobs 8 &&
+ GIT_TRACE=$(pwd)/trace.out git submodule update &&
+ grep "8 tasks" trace.out &&
+ GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
+ grep "9 tasks" trace.out
+ )
+'
+
+test_expect_success 'git clone passes the parallel jobs config on to submodules' '
+ test_when_finished "rm -rf super4" &&
+ GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
+ grep "7 tasks" trace.out &&
+ rm -rf super4 &&
+ git config --global submodule.fetchJobs 8 &&
+ GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
+ grep "8 tasks" trace.out &&
+ rm -rf super4 &&
+ GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
+ grep "9 tasks" trace.out &&
+ rm -rf super4
+'
+
test_done
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 7ca10b8..6ba5daf 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -178,6 +178,26 @@ test_expect_success 'test messages from "foreach --recursive"' '
'
cat > expect <<EOF
+Entering '../nested1'
+Entering '../nested1/nested2'
+Entering '../nested1/nested2/nested3'
+Entering '../nested1/nested2/nested3/submodule'
+Entering '../sub1'
+Entering '../sub2'
+Entering '../sub3'
+EOF
+
+test_expect_success 'test messages from "foreach --recursive" from subdirectory' '
+ (
+ cd clone2 &&
+ mkdir untracked &&
+ cd untracked &&
+ git submodule foreach --recursive >../../actual
+ ) &&
+ test_i18ncmp expect actual
+'
+
+cat > expect <<EOF
nested1-nested1
nested2-nested2
nested3-nested3
@@ -242,8 +262,12 @@ test_expect_success 'test "status --recursive"' '
test_cmp expect actual
'
-sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2
-mv -f expect2 expect
+cat > expect <<EOF
+ $nested1sha1 nested1 (heads/master)
++$nested2sha1 nested1/nested2 (file2~1)
+ $nested3sha1 nested1/nested2/nested3 (heads/master)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+EOF
test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
(
@@ -257,6 +281,27 @@ test_expect_success 'ensure "status --cached --recursive" preserves the --cached
test_cmp expect actual
'
+nested2sha1=$(git -C clone3/nested1/nested2 rev-parse HEAD)
+
+cat > expect <<EOF
+ $nested1sha1 ../nested1 (heads/master)
++$nested2sha1 ../nested1/nested2 (file2)
+ $nested3sha1 ../nested1/nested2/nested3 (heads/master)
+ $submodulesha1 ../nested1/nested2/nested3/submodule (heads/master)
+ $sub1sha1 ../sub1 ($sub1sha1_short)
+ $sub2sha1 ../sub2 ($sub2sha1_short)
+ $sub3sha1 ../sub3 (heads/master)
+EOF
+
+test_expect_success 'test "status --recursive" from sub directory' '
+ (
+ cd clone3 &&
+ mkdir tmp && cd tmp &&
+ git submodule status --recursive > ../../actual
+ ) &&
+ test_cmp expect actual
+'
+
test_expect_success 'use "git clone --recursive" to checkout all submodules' '
git clone --recursive super clone4 &&
(
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 63e0427..d84897a 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -200,6 +200,26 @@ test_expect_success '--amend --edit of empty message' '
test_cmp expect msg
'
+test_expect_success '--amend to set message to empty' '
+ echo bata >file &&
+ git add file &&
+ git commit -m "unamended" &&
+ git commit --amend --allow-empty-message -m "" &&
+ git diff-tree -s --format=%s HEAD >msg &&
+ echo "" >expect &&
+ test_cmp expect msg
+'
+
+test_expect_success '--amend to set empty message needs --allow-empty-message' '
+ echo conga >file &&
+ git add file &&
+ git commit -m "unamended" &&
+ test_must_fail git commit --amend -m "" &&
+ git diff-tree -s --format=%s HEAD >msg &&
+ echo "unamended" >expect &&
+ test_cmp expect msg
+'
+
test_expect_success '-m --edit' '
echo amended >expect &&
git commit --allow-empty -m buffer &&
@@ -587,4 +607,24 @@ test_expect_success '--only works on to-be-born branch' '
test_cmp expected actual
'
+test_expect_success '--dry-run with conflicts fixed from a merge' '
+ # setup two branches with conflicting information
+ # in the same file, resolve the conflict,
+ # call commit with --dry-run
+ echo "Initial contents, unimportant" >test-file &&
+ git add test-file &&
+ git commit -m "Initial commit" &&
+ echo "commit-1-state" >test-file &&
+ git commit -m "commit 1" -i test-file &&
+ git tag commit-1 &&
+ git checkout -b branch-2 HEAD^1 &&
+ echo "commit-2-state" >test-file &&
+ git commit -m "commit 2" -i test-file &&
+ ! $(git merge --no-commit commit-1) &&
+ echo "commit-2-state" >test-file &&
+ git add test-file &&
+ git commit --dry-run &&
+ git commit -m "conflicts fixed from merge."
+'
+
test_done
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index b39e313..725687d 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -527,11 +527,6 @@ try_commit_status_combo () {
test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit' '
- try_commit "" &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
- '
-
test_expect_success 'commit --status' '
try_commit --status &&
test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 2ddf28c..ed2653d 100755
--- a/t/t7507-commit-verbose.sh
+++ b/t/t7507-commit-verbose.sh
@@ -3,11 +3,10 @@
test_description='verbose commit template'
. ./test-lib.sh
-cat >check-for-diff <<EOF
-#!$SHELL_PATH
-exec grep '^diff --git' "\$1"
+write_script "check-for-diff" <<\EOF &&
+grep '^diff --git' "$1" >out
+exit 0
EOF
-chmod +x check-for-diff
test_set_editor "$PWD/check-for-diff"
cat >message <<'EOF'
@@ -23,7 +22,8 @@ test_expect_success 'setup' '
'
test_expect_success 'initial commit shows verbose diff' '
- git commit --amend -v
+ git commit --amend -v &&
+ test_line_count = 1 out
'
test_expect_success 'second commit' '
@@ -39,13 +39,15 @@ check_message() {
test_expect_success 'verbose diff is stripped out' '
git commit --amend -v &&
- check_message message
+ check_message message &&
+ test_line_count = 1 out
'
test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
git config diff.mnemonicprefix true &&
git commit --amend -v &&
- check_message message
+ check_message message &&
+ test_line_count = 1 out
'
cat >diff <<'EOF'
@@ -96,4 +98,60 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' '
test_i18ngrep "Aborting commit due to empty commit message." err
'
+test_expect_success 'status does not verbose without --verbose' '
+ git status >actual &&
+ ! grep "^diff --git" actual
+'
+
+test_expect_success 'setup -v -v' '
+ echo dirty >file
+'
+
+for i in true 1
+do
+ test_expect_success "commit.verbose=$i and --verbose omitted" "
+ git -c commit.verbose=$i commit --amend &&
+ test_line_count = 1 out
+ "
+done
+
+for i in false -2 -1 0
+do
+ test_expect_success "commit.verbose=$i and --verbose omitted" "
+ git -c commit.verbose=$i commit --amend &&
+ test_line_count = 0 out
+ "
+done
+
+for i in 2 3
+do
+ test_expect_success "commit.verbose=$i and --verbose omitted" "
+ git -c commit.verbose=$i commit --amend &&
+ test_line_count = 2 out
+ "
+done
+
+for i in true false -2 -1 0 1 2 3
+do
+ test_expect_success "commit.verbose=$i and --verbose" "
+ git -c commit.verbose=$i commit --amend --verbose &&
+ test_line_count = 1 out
+ "
+
+ test_expect_success "commit.verbose=$i and --no-verbose" "
+ git -c commit.verbose=$i commit --amend --no-verbose &&
+ test_line_count = 0 out
+ "
+
+ test_expect_success "commit.verbose=$i and -v -v" "
+ git -c commit.verbose=$i commit --amend -v -v &&
+ test_line_count = 2 out
+ "
+done
+
+test_expect_success "status ignores commit.verbose=true" '
+ git -c commit.verbose=true status >actual &&
+ ! grep "^diff --git actual"
+'
+
test_done
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 18e5cf0..4177a86 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -45,12 +45,18 @@ test_expect_success GPG 'create signed commits' '
git tag seventh-signed &&
echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
- git tag eighth-signed-alt
+ git tag eighth-signed-alt &&
+
+ # commit.gpgsign is still on but this must not be signed
+ git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) &&
+ # explicit -S of course must sign.
+ git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree})
'
test_expect_success GPG 'verify and show signatures' '
(
- for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+ for commit in initial second merge fourth-signed \
+ fifth-signed sixth-signed seventh-signed tenth-signed
do
git verify-commit $commit &&
git show --pretty=short --show-signature $commit >actual &&
@@ -60,7 +66,8 @@ test_expect_success GPG 'verify and show signatures' '
done
) &&
(
- for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+ for commit in merge^2 fourth-unsigned sixth-unsigned \
+ seventh-unsigned ninth-unsigned
do
test_must_fail git verify-commit $commit &&
git show --pretty=short --show-signature $commit >actual &&
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 302e238..85248a1 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -33,9 +33,11 @@ printf '%s\n' 1 2 3 4 5 6 7 8 9 >file
printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1
printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5
printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9
+printf '%s\n' 1 2 3 4 5 6 7 8 '9 Y' >file.9y
printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1
printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
+printf '%s\n' 1 2 3 4 5 6 7 8 '9 Z' >result.9z
>empty
create_merge_msgs () {
@@ -128,6 +130,12 @@ test_expect_success 'setup' '
git tag c2 &&
c2=$(git rev-parse HEAD) &&
git reset --hard "$c0" &&
+ cp file.9y file &&
+ git add file &&
+ test_tick &&
+ git commit -m "commit 7" &&
+ git tag c7 &&
+ git reset --hard "$c0" &&
cp file.9 file &&
git add file &&
test_tick &&
@@ -218,6 +226,26 @@ test_expect_success 'merge c1 with c2' '
verify_parents $c1 $c2
'
+test_expect_success 'merge --squash c3 with c7' '
+ git reset --hard c3 &&
+ test_must_fail git merge --squash c7 &&
+ cat result.9z >file &&
+ git commit --no-edit -a &&
+
+ {
+ cat <<-EOF
+ Squashed commit of the following:
+
+ $(git show -s c7)
+
+ # Conflicts:
+ # file
+ EOF
+ } >expect &&
+ git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ test_cmp expect actual
+'
+
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge c1 with c2 and c3' '
@@ -725,4 +753,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
test_must_fail git merge -s resolve master
'
+test_expect_success 'merge nothing into void' '
+ git init void &&
+ (
+ cd void &&
+ git remote add up .. &&
+ git fetch up &&
+ test_must_fail git merge FETCH_HEAD
+ )
+'
+
test_done
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index 0cb9d11..5d56c38 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' '
git tag c3
'
-test_expect_success 'merge c1 to c2' '
+merge_c1_to_c2_cmds='
git reset --hard c1 &&
git merge -s resolve c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -41,6 +41,10 @@ test_expect_success 'merge c1 to c2' '
test 3 = $(git ls-files | wc -l)
'
+test_expect_success 'merge c1 to c2' "$merge_c1_to_c2_cmds"
+
+test_expect_success 'merge c1 to c2, again' "$merge_c1_to_c2_cmds"
+
test_expect_success 'merge c2 to c3 (fails)' '
git reset --hard c2 &&
test_must_fail git merge -s resolve c3
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index 0e4a682..6729cb3 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t7609-merge-co-error-msgs.sh
@@ -37,14 +37,14 @@ EOF
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
test_must_fail git merge branch 2>out &&
- test_cmp out expect &&
+ test_i18ncmp out expect &&
git commit --allow-empty -m empty &&
(
GIT_MERGE_VERBOSITY=0 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
- test_cmp out2 expect &&
+ test_i18ncmp out2 expect &&
git reset --hard HEAD^
'
@@ -53,7 +53,7 @@ error: Your local changes to the following files would be overwritten by merge:
four
three
two
-Please, commit your changes or stash them before you can merge.
+Please commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
five
Please move or remove them before you can merge.
@@ -65,14 +65,14 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
git add three &&
git add four &&
test_must_fail git merge branch 2>out &&
- test_cmp out expect
+ test_i18ncmp out expect
'
cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout:
rep/one
rep/two
-Please, commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you can switch branches.
Aborting
EOF
@@ -87,21 +87,21 @@ test_expect_success 'cannot switch branches because of local changes' '
echo uno >rep/one &&
echo dos >rep/two &&
test_must_fail git checkout branch 2>out &&
- test_cmp out expect
+ test_i18ncmp out expect
'
cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout:
rep/one
rep/two
-Please, commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you can switch branches.
Aborting
EOF
test_expect_success 'not uptodate file porcelain checkout error' '
git add rep/one rep/two &&
test_must_fail git checkout branch 2>out &&
- test_cmp out expect
+ test_i18ncmp out expect
'
cat >expect <<\EOF
@@ -132,7 +132,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
>rep/untracked-file &&
>rep2/untracked-file &&
test_must_fail git checkout branch 2>out &&
- test_cmp out ../expect
+ test_i18ncmp out ../expect
'
test_done
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 6f12b23..76306cf 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -243,6 +243,70 @@ test_expect_success 'mergetool takes partial path' '
git reset --hard
'
+test_expect_success 'mergetool delete/delete conflict' '
+ git checkout -b delete-base branch1 &&
+ mkdir -p a/a &&
+ (echo one; echo two; echo 3; echo 4) >a/a/file.txt &&
+ git add a/a/file.txt &&
+ git commit -m"base file" &&
+ git checkout -b move-to-b delete-base &&
+ mkdir -p b/b &&
+ git mv a/a/file.txt b/b/file.txt &&
+ (echo one; echo two; echo 4) >b/b/file.txt &&
+ git commit -a -m"move to b" &&
+ git checkout -b move-to-c delete-base &&
+ mkdir -p c/c &&
+ git mv a/a/file.txt c/c/file.txt &&
+ (echo one; echo two; echo 3) >c/c/file.txt &&
+ git commit -a -m"move to c" &&
+ test_must_fail git merge move-to-b &&
+ echo d | git mergetool a/a/file.txt &&
+ ! test -f a/a/file.txt &&
+ git reset --hard HEAD &&
+ test_must_fail git merge move-to-b &&
+ echo m | git mergetool a/a/file.txt &&
+ test -f b/b/file.txt &&
+ git reset --hard HEAD &&
+ test_must_fail git merge move-to-b &&
+ ! echo a | git mergetool a/a/file.txt &&
+ ! test -f a/a/file.txt &&
+ git reset --hard HEAD
+'
+
+test_expect_success 'mergetool produces no errors when keepBackup is used' '
+ test_config mergetool.keepBackup true &&
+ test_must_fail git merge move-to-b &&
+ : >expect &&
+ echo d | git mergetool a/a/file.txt 2>actual &&
+ test_cmp expect actual &&
+ ! test -d a &&
+ git reset --hard HEAD
+'
+
+test_expect_success 'mergetool honors tempfile config for deleted files' '
+ test_config mergetool.keepTemporaries false &&
+ test_must_fail git merge move-to-b &&
+ echo d | git mergetool a/a/file.txt &&
+ ! test -d a &&
+ git reset --hard HEAD
+'
+
+test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' '
+ test_config mergetool.keepTemporaries true &&
+ test_must_fail git merge move-to-b &&
+ ! (echo a; echo n) | git mergetool a/a/file.txt &&
+ test -d a/a &&
+ cat >expect <<-\EOF &&
+ file_BASE_.txt
+ file_LOCAL_.txt
+ file_REMOTE_.txt
+ EOF
+ ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
+ test_cmp expect actual &&
+ git clean -fdx &&
+ git reset --hard HEAD
+'
+
test_expect_success 'deleted vs modified submodule' '
git checkout -b test6 branch1 &&
git submodule update -N &&
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 4e713f7..7ce4cd7 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -20,7 +20,7 @@ difftool_test_setup ()
prompt_given ()
{
prompt="$1"
- test "$prompt" = "Launch 'test-tool' [Y/n]: branch"
+ test "$prompt" = "Launch 'test-tool' [Y/n]? branch"
}
# Create a file on master and change it on branch
@@ -419,6 +419,29 @@ run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
grep file2 output
'
+run_dir_diff_test 'difftool --dir-diff with unmerged files' '
+ test_when_finished git reset --hard &&
+ test_config difftool.echo.cmd "echo ok" &&
+ git checkout -B conflict-a &&
+ git checkout -B conflict-b &&
+ git checkout conflict-a &&
+ echo a >>file &&
+ git add file &&
+ git commit -m conflict-a &&
+ git checkout conflict-b &&
+ echo b >>file &&
+ git add file &&
+ git commit -m conflict-b &&
+ git checkout master &&
+ git merge conflict-a &&
+ test_must_fail git merge conflict-b &&
+ cat >expect <<-EOF &&
+ ok
+ EOF
+ git difftool --dir-diff $symlinks -t echo >actual &&
+ test_cmp expect actual
+'
+
write_script .git/CHECK_SYMLINKS <<\EOF
for f in file file2 sub/sub
do
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index b540944..1e72971 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -905,6 +905,33 @@ test_expect_success 'inside git repository but with --no-index' '
)
'
+test_expect_success 'grep --no-index descends into repos, but not .git' '
+ rm -fr non &&
+ mkdir -p non/git &&
+ (
+ GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
+ export GIT_CEILING_DIRECTORIES &&
+ cd non/git &&
+
+ echo magic >file &&
+ git init repo &&
+ (
+ cd repo &&
+ echo magic >file &&
+ git add file &&
+ git commit -m foo &&
+ echo magic >.git/file
+ ) &&
+
+ cat >expect <<-\EOF &&
+ file
+ repo/file
+ EOF
+ git grep -l --no-index magic >actual &&
+ test_cmp expect actual
+ )
+'
+
test_expect_success 'setup double-dash tests' '
cat >double-dash <<EOF &&
--
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 6568429..a9b266f 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -212,4 +212,18 @@ test_expect_success 'blame file with CRLF attributes text' '
grep "A U Thor" actual
'
+test_expect_success 'blame file with CRLF core.autocrlf=true' '
+ git config core.autocrlf false &&
+ printf "testcase\r\n" >crlfinrepo &&
+ >.gitattributes &&
+ git add crlfinrepo &&
+ git commit -m "add crlfinrepo" &&
+ git config core.autocrlf true &&
+ mv crlfinrepo tmp &&
+ git checkout crlfinrepo &&
+ rm tmp &&
+ git blame crlfinrepo >actual &&
+ grep "A U Thor" actual
+'
+
test_done
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 22d8367..28082b1 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -45,13 +45,13 @@ test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
name='try a deep --rmdir with a commit'
test_expect_success "$name" '
- git checkout -f -b mybranch ${remotes_git_svn} &&
+ git checkout -f -b mybranch remotes/git-svn &&
mv dir/a/b/c/d/e/file dir/file &&
cp dir/file file &&
git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch &&
+ remotes/git-svn..mybranch &&
svn_cmd up "$SVN_TREE" &&
test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
@@ -65,14 +65,14 @@ test_expect_success "$name" "
git update-index --add dir/file/file &&
git commit -m '$name' &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch
+ remotes/git-svn..mybranch
"
name='detect node change from directory to file #1'
test_expect_success "$name" '
rm -rf dir "$GIT_DIR"/index &&
- git checkout -f -b mybranch2 ${remotes_git_svn} &&
+ git checkout -f -b mybranch2 remotes/git-svn &&
mv bar/zzz zzz &&
rm -rf bar &&
mv zzz bar &&
@@ -80,14 +80,14 @@ test_expect_success "$name" '
git update-index --add -- bar &&
git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch2
+ remotes/git-svn..mybranch2
'
name='detect node change from file to directory #2'
test_expect_success "$name" '
rm -f "$GIT_DIR"/index &&
- git checkout -f -b mybranch3 ${remotes_git_svn} &&
+ git checkout -f -b mybranch3 remotes/git-svn &&
rm bar/zzz &&
git update-index --remove bar/zzz &&
mkdir bar/zzz &&
@@ -95,7 +95,7 @@ test_expect_success "$name" '
git update-index --add bar/zzz/yyy &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch3 &&
+ remotes/git-svn..mybranch3 &&
svn_cmd up "$SVN_TREE" &&
test -d "$SVN_TREE"/bar/zzz &&
test -e "$SVN_TREE"/bar/zzz/yyy
@@ -104,7 +104,7 @@ test_expect_success "$name" '
name='detect node change from directory to file #2'
test_expect_success "$name" '
rm -f "$GIT_DIR"/index &&
- git checkout -f -b mybranch4 ${remotes_git_svn} &&
+ git checkout -f -b mybranch4 remotes/git-svn &&
rm -rf dir &&
git update-index --remove -- dir/file &&
touch dir &&
@@ -112,19 +112,19 @@ test_expect_success "$name" '
git update-index --add -- dir &&
git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch4
+ remotes/git-svn..mybranch4
'
name='remove executable bit from a file'
test_expect_success POSIXPERM "$name" '
rm -f "$GIT_DIR"/index &&
- git checkout -f -b mybranch5 ${remotes_git_svn} &&
+ git checkout -f -b mybranch5 remotes/git-svn &&
chmod -x exec.sh &&
git update-index exec.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch5 &&
+ remotes/git-svn..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test ! -x "$SVN_TREE"/exec.sh'
@@ -135,7 +135,7 @@ test_expect_success POSIXPERM "$name" '
git update-index exec.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch5 &&
+ remotes/git-svn..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -x "$SVN_TREE"/exec.sh'
@@ -147,7 +147,7 @@ test_expect_success SYMLINKS "$name" '
git update-index exec.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch5 &&
+ remotes/git-svn..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -h "$SVN_TREE"/exec.sh'
@@ -159,7 +159,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
git update-index --add file exec-2.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch5 &&
+ remotes/git-svn..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -x "$SVN_TREE"/file &&
test -h "$SVN_TREE"/exec-2.sh'
@@ -172,7 +172,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
git update-index exec-2.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
- ${remotes_git_svn}..mybranch5 &&
+ remotes/git-svn..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -f "$SVN_TREE"/exec-2.sh &&
test ! -h "$SVN_TREE"/exec-2.sh &&
@@ -194,7 +194,7 @@ GIT_SVN_ID=alt
export GIT_SVN_ID
test_expect_success "$name" \
'git svn init "$svnrepo" && git svn fetch &&
- git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
+ git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
test_cmp a b'
@@ -217,17 +217,17 @@ EOF
test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
-test_expect_success 'exit if remote refs are ambigious' "
+test_expect_success 'exit if remote refs are ambigious' '
git config --add svn-remote.svn.fetch \
- bar:refs/${remotes_git_svn} &&
+ bar:refs/remotes/git-svn &&
test_must_fail git svn migrate
-"
+'
test_expect_success 'exit if init-ing a would clobber a URL' '
svnadmin create "${PWD}/svnrepo2" &&
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
git config --unset svn-remote.svn.fetch \
- "^bar:refs/${remotes_git_svn}$" &&
+ "^bar:refs/remotes/git-svn$" &&
test_must_fail git svn init "${svnrepo}2/bar"
'
@@ -237,7 +237,7 @@ test_expect_success \
git config --get svn-remote.svn.fetch \
"^bar:refs/remotes/bar$" &&
git config --get svn-remote.svn.fetch \
- "^:refs/${remotes_git_svn}$"
+ "^:refs/remotes/git-svn$"
'
test_expect_success 'dcommit $rev does not clobber current branch' '
@@ -259,26 +259,26 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
git branch -D my-bar
'
-test_expect_success 'able to dcommit to a subdirectory' "
+test_expect_success 'able to dcommit to a subdirectory' '
git svn fetch -i bar &&
git checkout -b my-bar refs/remotes/bar &&
echo abc > d &&
git update-index --add d &&
- git commit -m '/bar/d should be in the log' &&
+ git commit -m "/bar/d should be in the log" &&
git svn dcommit -i bar &&
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
mkdir newdir &&
echo new > newdir/dir &&
git update-index --add newdir/dir &&
- git commit -m 'add a new directory' &&
+ git commit -m "add a new directory" &&
git svn dcommit -i bar &&
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
echo foo >> newdir/dir &&
git update-index newdir/dir &&
- git commit -m 'modify a file in new directory' &&
+ git commit -m "modify a file in new directory" &&
git svn dcommit -i bar &&
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
- "
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
test_expect_success 'dcommit should not fail with a touched file' '
test_commit "commit-new-file-foo2" foo2 &&
@@ -291,13 +291,13 @@ test_expect_success 'rebase should not fail with a touched file' '
git svn rebase
'
-test_expect_success 'able to set-tree to a subdirectory' "
+test_expect_success 'able to set-tree to a subdirectory' '
echo cba > d &&
git update-index d &&
- git commit -m 'update /bar/d' &&
+ git commit -m "update /bar/d" &&
git svn set-tree -i bar HEAD &&
- test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
- "
+ test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
test_expect_success 'git-svn works in a bare repository' '
mkdir bare-repo &&
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index e8173d5..07bfb63 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -73,11 +73,11 @@ test_expect_success 'fetch revisions from svn' 'git svn fetch'
name='test svn:keywords ignoring'
test_expect_success "$name" \
- 'git checkout -b mybranch ${remotes_git_svn} &&
+ 'git checkout -b mybranch remotes/git-svn &&
echo Hi again >> kw.c &&
git commit -a -m "test keywords ignoring" &&
- git svn set-tree ${remotes_git_svn}..mybranch &&
- git pull . ${remotes_git_svn}'
+ git svn set-tree remotes/git-svn..mybranch &&
+ git pull . remotes/git-svn'
expect='/* $Id$ */'
got="$(sed -ne 2p kw.c)"
@@ -95,7 +95,7 @@ test_expect_success "propset CR on crlf files" '
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
'git svn fetch &&
- git pull . ${remotes_git_svn} &&
+ git pull . remotes/git-svn &&
svn_cmd co "$svnrepo" new_wc'
for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
@@ -117,7 +117,7 @@ cd test_wc
svn_cmd commit -m "propset CRLF on cr files"'
cd ..
test_expect_success 'fetch and pull latest from svn' \
- 'git svn fetch && git pull . ${remotes_git_svn}'
+ 'git svn fetch && git pull . remotes/git-svn'
b_cr="$(git hash-object cr)"
b_ne_cr="$(git hash-object ne_cr)"
@@ -168,7 +168,7 @@ cat >create-ignore-index.expect <<\EOF
EOF
test_expect_success 'test create-ignore' "
- git svn fetch && git pull . ${remotes_git_svn} &&
+ git svn fetch && git pull . remotes/git-svn &&
git svn create-ignore &&
cmp ./.gitignore create-ignore.expect &&
cmp ./deeply/.gitignore create-ignore.expect &&
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index eb70f48..66cd511 100755
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -17,7 +17,7 @@ test_expect_success 'initialize repo' '
test_expect_success 'mirror via git svn' '
git svn init "$svnrepo" &&
git svn fetch &&
- git checkout -f -b test-rmdir ${remotes_git_svn}
+ git checkout -f -b test-rmdir remotes/git-svn
'
test_expect_success 'Try a commit on rmdir' '
diff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh
index 3413164..b282713 100755
--- a/t/t9103-git-svn-tracked-directory-removed.sh
+++ b/t/t9103-git-svn-tracked-directory-removed.sh
@@ -23,17 +23,19 @@ test_expect_success 'make history for tracking' '
test_expect_success 'clone repo with git' '
git svn clone -s "$svnrepo" x &&
- test -f x/FOLLOWME &&
- test ! -f x/README
+ test_path_is_file x/FOLLOWME &&
+ test_path_is_missing x/README
'
-test_expect_success 'make sure r2 still has old file' "
- cd x &&
- test -n \"\$(git svn find-rev r1)\" &&
- git reset --hard \$(git svn find-rev r1) &&
- test -f README &&
- test ! -f FOLLOWME &&
- test x\$(git svn find-rev r2) = x
-"
+test_expect_success 'make sure r2 still has old file' '
+ (
+ cd x &&
+ test -n "$(git svn find-rev r1)" &&
+ git reset --hard "$(git svn find-rev r1)" &&
+ test_path_is_file README &&
+ test_path_is_missing FOLLOWME &&
+ test -z "$(git svn find-rev r2)"
+ )
+'
test_done
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index f6d7ac7..dbe8dea 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -44,7 +44,7 @@ test_expect_success 'commit complementing change from git' '
test_expect_success 'dcommit fails to commit because of conflict' '
git svn init "$svnrepo" &&
git svn fetch &&
- git reset --hard refs/${remotes_git_svn} &&
+ git reset --hard refs/remotes/git-svn &&
svn_cmd co "$svnrepo" t.svn &&
(
cd t.svn &&
@@ -59,7 +59,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
'
test_expect_success 'dcommit does the svn equivalent of an index merge' "
- git reset --hard refs/${remotes_git_svn} &&
+ git reset --hard refs/remotes/git-svn &&
echo 'index merge' > file2 &&
git update-index --add file2 &&
git commit -a -m 'index merge' &&
@@ -81,7 +81,7 @@ test_expect_success 'commit another change from svn side' '
'
test_expect_success 'multiple dcommit from git svn will not clobber svn' "
- git reset --hard refs/${remotes_git_svn} &&
+ git reset --hard refs/remotes/git-svn &&
echo new file >> new-file &&
git update-index --add new-file &&
git commit -a -m 'new file' &&
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9060198..9f3ef8f 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -19,13 +19,14 @@ test_expect_success 'setup old-looking metadata' '
git svn init "$svnrepo" &&
git svn fetch &&
rm -rf "$GIT_DIR"/svn &&
- git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
- git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
- git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
+ git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
+ git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
+ git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
'
-head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)
-test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
+test_expect_success 'git-svn-HEAD is a real HEAD' '
+ git rev-parse --verify refs/heads/git-svn-HEAD^0
+'
svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
@@ -35,11 +36,11 @@ test_expect_success 'initialize old-style (v0) git svn layout' '
echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
git svn migrate &&
! test -d "$GIT_DIR"/git-svn &&
- git rev-parse --verify refs/${remotes_git_svn}^0 &&
+ git rev-parse --verify refs/remotes/git-svn^0 &&
git rev-parse --verify refs/remotes/svn^0 &&
test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
test $(git config --get svn-remote.svn.fetch) = \
- ":refs/${remotes_git_svn}"
+ ":refs/remotes/git-svn"
'
test_expect_success 'initialize a multi-repository repo' '
@@ -56,9 +57,11 @@ test_expect_success 'initialize a multi-repository repo' '
"^tags/\*:refs/remotes/origin/tags/\*$" &&
git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
- for i in tags/0.1 tags/0.2 tags/0.3; do
+ for i in tags/0.1 tags/0.2 tags/0.3
+ do
git config --add svn-remote.svn.fetch \
- $i:refs/remotes/origin/$i || exit 1; done &&
+ $i:refs/remotes/origin/$i || return 1
+ done &&
git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
@@ -66,34 +69,42 @@ test_expect_success 'initialize a multi-repository repo' '
grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
- grep "^:refs/${remotes_git_svn}" fetch.out
+ grep "^:refs/remotes/git-svn" fetch.out
'
# refs should all be different, but the trees should all be the same:
-test_expect_success 'multi-fetch works on partial urls + paths' "
+test_expect_success 'multi-fetch works on partial urls + paths' '
+ refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
git svn multi-fetch &&
- for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
- git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1;
- done &&
- test -z \"\$(sort < refs.out | uniq -d)\" &&
- for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
- for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
- if test \$j != \$i; then continue; fi
- test -z \"\$(git diff refs/remotes/origin/\$i \
- refs/remotes/origin/\$j)\" ||exit 1; done; done
- "
+ for i in $refs
+ do
+ git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
+ done >refs.out &&
+ test -z "$(sort <refs.out | uniq -d)" &&
+ for i in $refs
+ do
+ for j in $refs
+ do
+ git diff --exit-code refs/remotes/origin/$i \
+ refs/remotes/origin/$j ||
+ return 1
+ done
+ done
+'
test_expect_success 'migrate --minimize on old inited layout' '
git config --unset-all svn-remote.svn.fetch &&
git config --unset-all svn-remote.svn.url &&
rm -rf "$GIT_DIR"/svn &&
- for i in $(cat fetch.out); do
+ for i in $(cat fetch.out)
+ do
path=$(expr $i : "\([^:]*\):.*$")
ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
if test -z "$ref"; then continue; fi
if test -n "$path"; then path="/$path"; fi
- ( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
- echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
+ mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
+ echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
+ return 1
done &&
git svn migrate --minimize &&
test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
@@ -104,7 +115,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
- grep "^:refs/${remotes_git_svn}" fetch.out
+ grep "^:refs/remotes/git-svn" fetch.out
'
test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index 29fbdfd..dde0a3c 100755
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -22,31 +22,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
bar_url=http://mayonaise/svnrepo/bar
test_expect_success 'verify metadata for /bar' "
git cat-file commit refs/remotes/bar | \
- grep '^${git_svn_id}: $bar_url@12 $uuid$' &&
+ grep '^git-svn-id: $bar_url@12 $uuid$' &&
git cat-file commit refs/remotes/bar~1 | \
- grep '^${git_svn_id}: $bar_url@11 $uuid$' &&
+ grep '^git-svn-id: $bar_url@11 $uuid$' &&
git cat-file commit refs/remotes/bar~2 | \
- grep '^${git_svn_id}: $bar_url@10 $uuid$' &&
+ grep '^git-svn-id: $bar_url@10 $uuid$' &&
git cat-file commit refs/remotes/bar~3 | \
- grep '^${git_svn_id}: $bar_url@9 $uuid$' &&
+ grep '^git-svn-id: $bar_url@9 $uuid$' &&
git cat-file commit refs/remotes/bar~4 | \
- grep '^${git_svn_id}: $bar_url@6 $uuid$' &&
+ grep '^git-svn-id: $bar_url@6 $uuid$' &&
git cat-file commit refs/remotes/bar~5 | \
- grep '^${git_svn_id}: $bar_url@1 $uuid$'
+ grep '^git-svn-id: $bar_url@1 $uuid$'
"
e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
git cat-file commit refs/remotes/e | \
- grep '^${git_svn_id}: $e_url@1 $uuid$'
+ grep '^git-svn-id: $e_url@1 $uuid$'
"
dir_url=http://mayonaise/svnrepo/dir
test_expect_success 'verify metadata for /dir' "
git cat-file commit refs/remotes/dir | \
- grep '^${git_svn_id}: $dir_url@2 $uuid$' &&
+ grep '^git-svn-id: $dir_url@2 $uuid$' &&
git cat-file commit refs/remotes/dir~1 | \
- grep '^${git_svn_id}: $dir_url@1 $uuid$'
+ grep '^git-svn-id: $dir_url@1 $uuid$'
"
test_expect_success 'find commit based on SVN revision number' "
diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh
index bd081c2..22b6e5e 100755
--- a/t/t9111-git-svn-use-svnsync-props.sh
+++ b/t/t9111-git-svn-use-svnsync-props.sh
@@ -21,31 +21,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
bar_url=http://mayonaise/svnrepo/bar
test_expect_success 'verify metadata for /bar' "
git cat-file commit refs/remotes/bar | \
- grep '^${git_svn_id}: $bar_url@12 $uuid$' &&
+ grep '^git-svn-id: $bar_url@12 $uuid$' &&
git cat-file commit refs/remotes/bar~1 | \
- grep '^${git_svn_id}: $bar_url@11 $uuid$' &&
+ grep '^git-svn-id: $bar_url@11 $uuid$' &&
git cat-file commit refs/remotes/bar~2 | \
- grep '^${git_svn_id}: $bar_url@10 $uuid$' &&
+ grep '^git-svn-id: $bar_url@10 $uuid$' &&
git cat-file commit refs/remotes/bar~3 | \
- grep '^${git_svn_id}: $bar_url@9 $uuid$' &&
+ grep '^git-svn-id: $bar_url@9 $uuid$' &&
git cat-file commit refs/remotes/bar~4 | \
- grep '^${git_svn_id}: $bar_url@6 $uuid$' &&
+ grep '^git-svn-id: $bar_url@6 $uuid$' &&
git cat-file commit refs/remotes/bar~5 | \
- grep '^${git_svn_id}: $bar_url@1 $uuid$'
+ grep '^git-svn-id: $bar_url@1 $uuid$'
"
e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
git cat-file commit refs/remotes/e | \
- grep '^${git_svn_id}: $e_url@1 $uuid$'
+ grep '^git-svn-id: $e_url@1 $uuid$'
"
dir_url=http://mayonaise/svnrepo/dir
test_expect_success 'verify metadata for /dir' "
git cat-file commit refs/remotes/dir | \
- grep '^${git_svn_id}: $dir_url@2 $uuid$' &&
+ grep '^git-svn-id: $dir_url@2 $uuid$' &&
git cat-file commit refs/remotes/dir~1 | \
- grep '^${git_svn_id}: $dir_url@1 $uuid$'
+ grep '^git-svn-id: $dir_url@1 $uuid$'
"
test_done
diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 1c84ce1..59465b1 100755
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -22,7 +22,7 @@ test_expect_success 'test clone with percent escapes' '
git svn clone "$svnrepo/pr%20ject" clone &&
(
cd clone &&
- git rev-parse refs/${remotes_git_svn}
+ git rev-parse refs/remotes/git-svn
)
'
@@ -42,7 +42,7 @@ test_expect_success 'test clone trunk with percent escapes and minimize-url' '
git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
(
cd minimize &&
- git rev-parse refs/${remotes_git_svn}
+ git rev-parse refs/remotes/git-svn
)
'
@@ -50,7 +50,7 @@ test_expect_success 'test clone trunk with percent escapes' '
git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
(
cd trunk &&
- git rev-parse refs/${remotes_git_svn}
+ git rev-parse refs/remotes/git-svn
)
'
diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index fd81847..ead4045 100755
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -17,7 +17,7 @@ rm -rf import
test_expect_success 'init, fetch and checkout repository' '
git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
git svn fetch &&
- git checkout -b mybranch ${remotes_git_svn}
+ git checkout -b mybranch remotes/git-svn
'
test_expect_success 'remove rev_map' '
diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh
index 88a2cfa..372ef15 100755
--- a/t/t9153-git-svn-rewrite-uuid.sh
+++ b/t/t9153-git-svn-rewrite-uuid.sh
@@ -17,9 +17,9 @@ test_expect_success 'load svn repo' "
test_expect_success 'verify uuid' "
git cat-file commit refs/remotes/git-svn~0 | \
- grep '^${git_svn_id}: .*@2 $uuid$' &&
+ grep '^git-svn-id: .*@2 $uuid$' &&
git cat-file commit refs/remotes/git-svn~1 | \
- grep '^${git_svn_id}: .*@1 $uuid$'
+ grep '^git-svn-id: .*@1 $uuid$'
"
test_done
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 4c5f3c9..4bca35c 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -55,6 +55,10 @@ test_expect_success 'empty stream succeeds' '
git fast-import </dev/null
'
+test_expect_success 'truncated stream complains' '
+ echo "tag foo" | test_must_fail git fast-import
+'
+
test_expect_success 'A: create pack from stdin' '
test_tick &&
cat >input <<-INPUT_END &&
@@ -2646,6 +2650,21 @@ test_expect_success 'R: ignore non-git options' '
git fast-import <input
'
+test_expect_success 'R: corrupt lines do not mess marks file' '
+ rm -f io.marks &&
+ blob=$(echo hi | git hash-object --stdin) &&
+ cat >expect <<-EOF &&
+ :3 0000000000000000000000000000000000000000
+ :1 $blob
+ :2 $blob
+ EOF
+ cp expect io.marks &&
+ test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
+
+ EOF
+ test_cmp expect io.marks
+'
+
##
## R: very large blobs
##
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index d708cbf..432c61d 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -45,7 +45,8 @@ test_expect_success 'setup' '
touch secondrootfile &&
git add secondrootfile &&
git commit -m "second root") &&
- git pull secondroot master &&
+ git fetch secondroot master &&
+ git merge --allow-unrelated-histories FETCH_HEAD &&
git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 66d3fc9..eb9a8ed 100755
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -223,12 +223,12 @@ build_gendouble() {
import sys
import struct
- s = struct.pack(">LL18s",
+ s = struct.pack(b">LL18s",
0x00051607, # AppleDouble
0x00020000, # version 2
- "" # pad to 26 bytes
+ b"" # pad to 26 bytes
)
- sys.stdout.write(s)
+ getattr(sys.stdout, 'buffer', sys.stdout).write(s)
EOF
}
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh
index 0b664a3..110a7e7 100755
--- a/t/t9824-git-p4-git-lfs.sh
+++ b/t/t9824-git-p4-git-lfs.sh
@@ -13,6 +13,10 @@ test_file_in_lfs () {
FILE="$1" &&
SIZE="$2" &&
EXPECTED_CONTENT="$3" &&
+ sed -n '1,1 p' "$FILE" | grep "^version " &&
+ sed -n '2,2 p' "$FILE" | grep "^oid " &&
+ sed -n '3,3 p' "$FILE" | grep "^size " &&
+ test_line_count = 3 "$FILE" &&
cat "$FILE" | grep "size $SIZE" &&
HASH=$(cat "$FILE" | grep "oid sha256:" | sed -e "s/oid sha256://g") &&
LFS_FILE=".git/lfs/objects/$(echo "$HASH" | cut -c1-2)/$(echo "$HASH" | cut -c3-4)/$HASH" &&
@@ -265,7 +269,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr
# We only import HEAD here ("@all" is missing!)
git p4 clone --destination="$git" //depot &&
- test_file_in_lfs file6.bin 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ"
+ test_file_in_lfs file6.bin 39 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" &&
test_file_count_in_dir ".git/lfs/objects" 1 &&
cat >expect <<-\EOF &&
diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh
index be12960..fa8b9da 100755
--- a/t/t9826-git-p4-keep-empty-commits.sh
+++ b/t/t9826-git-p4-keep-empty-commits.sh
@@ -47,23 +47,23 @@ test_expect_success 'Clone repo root path with all history' '
git init . &&
git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF &&
-Remove file 4
-[git-p4: depot-paths = "//depot/": change = 6]
+ Remove file 4
+ [git-p4: depot-paths = "//depot/": change = 6]
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+ Remove file 3
+ [git-p4: depot-paths = "//depot/": change = 5]
-Add file 4
-[git-p4: depot-paths = "//depot/": change = 4]
+ Add file 4
+ [git-p4: depot-paths = "//depot/": change = 4]
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+ Add file 3
+ [git-p4: depot-paths = "//depot/": change = 3]
-Add file 2
-[git-p4: depot-paths = "//depot/": change = 2]
+ Add file 2
+ [git-p4: depot-paths = "//depot/": change = 2]
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+ Add file 1
+ [git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
@@ -80,23 +80,23 @@ test_expect_success 'Clone repo subdir with all history but keep empty commits'
git config git-p4.keepEmptyCommits true &&
git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF &&
-Remove file 4
-[git-p4: depot-paths = "//depot/": change = 6]
+ Remove file 4
+ [git-p4: depot-paths = "//depot/": change = 6]
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+ Remove file 3
+ [git-p4: depot-paths = "//depot/": change = 5]
-Add file 4
-[git-p4: depot-paths = "//depot/": change = 4]
+ Add file 4
+ [git-p4: depot-paths = "//depot/": change = 4]
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+ Add file 3
+ [git-p4: depot-paths = "//depot/": change = 3]
-Add file 2
-[git-p4: depot-paths = "//depot/": change = 2]
+ Add file 2
+ [git-p4: depot-paths = "//depot/": change = 2]
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+ Add file 1
+ [git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
@@ -112,14 +112,14 @@ test_expect_success 'Clone repo subdir with all history' '
git init . &&
git p4 clone --use-client-spec --destination="$git" --verbose //depot@all &&
cat >expect <<-\EOF &&
-Remove file 3
-[git-p4: depot-paths = "//depot/": change = 5]
+ Remove file 3
+ [git-p4: depot-paths = "//depot/": change = 5]
-Add file 3
-[git-p4: depot-paths = "//depot/": change = 3]
+ Add file 3
+ [git-p4: depot-paths = "//depot/": change = 3]
-Add file 1
-[git-p4: depot-paths = "//depot/": change = 1]
+ Add file 1
+ [git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh
new file mode 100755
index 0000000..e20395c
--- /dev/null
+++ b/t/t9828-git-p4-map-user.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+test_description='Clone repositories and map users'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'Create a repo with different users' '
+ client_view "//depot/... //client/..." &&
+ (
+ cd "$cli" &&
+
+ >author.txt &&
+ p4 add author.txt &&
+ p4 submit -d "Add file author\\n" &&
+
+ P4USER=mmax &&
+ >max.txt &&
+ p4 add max.txt &&
+ p4 submit -d "Add file max" &&
+
+ P4USER=eri &&
+ >moritz.txt &&
+ p4 add moritz.txt &&
+ p4 submit -d "Add file moritz" &&
+
+ P4USER=no &&
+ >nobody.txt &&
+ p4 add nobody.txt &&
+ p4 submit -d "Add file nobody"
+ )
+'
+
+test_expect_success 'Clone repo root path with all history' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git init . &&
+ git config --add git-p4.mapUser "mmax = Max Musterman <max@example.com> " &&
+ git config --add git-p4.mapUser " eri=Erika Musterman <erika@example.com>" &&
+ git p4 clone --use-client-spec --destination="$git" //depot@all &&
+ cat >expect <<-\EOF &&
+ no <no@client>
+ Erika Musterman <erika@example.com>
+ Max Musterman <max@example.com>
+ Dr. author <author@example.com>
+ EOF
+ git log --format="%an <%ae>" >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'kill p4d' '
+ kill_p4d
+'
+
+test_done
diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh
new file mode 100755
index 0000000..971aeee
--- /dev/null
+++ b/t/t9829-git-p4-jobs.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+test_description='git p4 retrieve job info'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+ start_p4d
+'
+
+test_expect_success 'add p4 jobs' '
+ (
+ p4_add_job TESTJOB-A &&
+ p4_add_job TESTJOB-B
+ )
+'
+
+test_expect_success 'add p4 files' '
+ client_view "//depot/... //client/..." &&
+ (
+ cd "$cli" &&
+ >file1 &&
+ p4 add file1 &&
+ p4 submit -d "Add file 1"
+ )
+'
+
+test_expect_success 'check log message of changelist with no jobs' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git init . &&
+ git p4 clone --use-client-spec --destination="$git" //depot@all &&
+ cat >expect <<-\EOF &&
+ Add file 1
+ [git-p4: depot-paths = "//depot/": change = 1]
+
+ EOF
+ git log --format=%B >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'add TESTJOB-A to change 1' '
+ (
+ cd "$cli" &&
+ p4 fix -c 1 TESTJOB-A
+ )
+'
+
+test_expect_success 'check log message of changelist with one job' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git init . &&
+ git p4 clone --use-client-spec --destination="$git" //depot@all &&
+ cat >expect <<-\EOF &&
+ Add file 1
+ Jobs: TESTJOB-A
+ [git-p4: depot-paths = "//depot/": change = 1]
+
+ EOF
+ git log --format=%B >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'add TESTJOB-B to change 1' '
+ (
+ cd "$cli" &&
+ p4 fix -c 1 TESTJOB-B
+ )
+'
+
+test_expect_success 'check log message of changelist with more jobs' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git init . &&
+ git p4 clone --use-client-spec --destination="$git" //depot@all &&
+ cat >expect <<-\EOF &&
+ Add file 1
+ Jobs: TESTJOB-A TESTJOB-B
+ [git-p4: depot-paths = "//depot/": change = 1]
+
+ EOF
+ git log --format=%B >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'kill p4d' '
+ kill_p4d
+'
+
+test_done
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index ffbfa0e..0db4469 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -107,7 +107,7 @@ test_expect_success 'prompt - describe detached head - contains' '
'
test_expect_success 'prompt - describe detached head - branch' '
- printf " ((b1~1))" >expected &&
+ printf " ((tags/t2~1))" >expected &&
git checkout b1^ &&
test_when_finished "git checkout master" &&
(
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8d99eb3..48884d5 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -718,20 +718,13 @@ test_cmp_rev () {
test_cmp expect.rev actual.rev
}
-# Print a sequence of numbers or letters in increasing order. This is
-# similar to GNU seq(1), but the latter might not be available
-# everywhere (and does not do letters). It may be used like:
-#
-# for i in $(test_seq 100)
-# do
-# for j in $(test_seq 10 20)
-# do
-# for k in $(test_seq a z)
-# do
-# echo $i-$j-$k
-# done
-# done
-# done
+# Print a sequence of integers in increasing order, either with
+# two arguments (start and end):
+#
+# test_seq 1 5 -- outputs 1 2 3 4 5 one line at a time
+#
+# or with one argument (end), in which case it starts counting
+# from 1.
test_seq () {
case $# in
@@ -739,7 +732,12 @@ test_seq () {
2) ;;
*) error "bug in the test script: not 1 or 2 parameters to test_seq" ;;
esac
- perl -le 'print for $ARGV[0]..$ARGV[1]' -- "$@"
+ test_seq_counter__=$1
+ while test "$test_seq_counter__" -le "$2"
+ do
+ echo "$test_seq_counter__"
+ test_seq_counter__=$(( $test_seq_counter__ + 1 ))
+ done
}
# This function can be used to schedule some commands to be run
@@ -941,3 +939,25 @@ mingw_read_file_strip_cr_ () {
eval "$1=\$$1\$line"
done
}
+
+# Like "env FOO=BAR some-program", but run inside a subshell, which means
+# it also works for shell functions (though those functions cannot impact
+# the environment outside of the test_env invocation).
+test_env () {
+ (
+ while test $# -gt 0
+ do
+ case "$1" in
+ *=*)
+ eval "${1%%=*}=\${1#*=}"
+ eval "export ${1%%=*}"
+ shift
+ ;;
+ *)
+ "$@"
+ exit
+ ;;
+ esac
+ done
+ )
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0b47eb6..0055ebb 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -202,13 +202,13 @@ do
}
run_list=$1; shift ;;
--run=*)
- run_list=$(expr "z$1" : 'z[^=]*=\(.*\)'); shift ;;
+ run_list=${1#--*=}; shift ;;
-h|--h|--he|--hel|--help)
help=t; shift ;;
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
verbose=t; shift ;;
--verbose-only=*)
- verbose_only=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ verbose_only=${1#--*=}
shift ;;
-q|--q|--qu|--qui|--quie|--quiet)
# Ignore --quiet under a TAP::Harness. Saying how many tests
@@ -222,15 +222,15 @@ do
valgrind=memcheck
shift ;;
--valgrind=*)
- valgrind=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ valgrind=${1#--*=}
shift ;;
--valgrind-only=*)
- valgrind_only=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ valgrind_only=${1#--*=}
shift ;;
--tee)
shift ;; # was handled already
--root=*)
- root=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ root=${1#--*=}
shift ;;
--chain-lint)
GIT_TEST_CHAIN_LINT=1
@@ -322,6 +322,19 @@ else
exec 4>/dev/null 3>/dev/null
fi
+# Send any "-x" output directly to stderr to avoid polluting tests
+# which capture stderr. We can do this unconditionally since it
+# has no effect if tracing isn't turned on.
+#
+# Note that this sets up the trace fd as soon as we assign the variable, so it
+# must come after the creation of descriptor 4 above. Likewise, we must never
+# unset this, as it has the side effect of closing descriptor 4, which we
+# use to show verbose tests to the user.
+#
+# Note also that we don't need or want to export it. The tracing is local to
+# this shell, and we would not want to influence any shells we exec.
+BASH_XTRACEFD=4
+
test_failure=0
test_count=0
test_fixed=0
@@ -854,10 +867,10 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
error "You haven't built things yet, have you?"
}
-if ! test -x "$GIT_BUILD_DIR"/test-chmtime
+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-chmtime
then
echo >&2 'You need to build test-chmtime:'
- echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
+ echo >&2 'Run "make t/helper/test-chmtime" in the source (toplevel) directory'
exit 1
fi
diff --git a/tag.c b/tag.c
index d72f742..d1dcd18 100644
--- a/tag.c
+++ b/tag.c
@@ -6,6 +6,59 @@
const char *tag_type = "tag";
+static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
+{
+ struct signature_check sigc;
+ size_t payload_size;
+ int ret;
+
+ memset(&sigc, 0, sizeof(sigc));
+
+ payload_size = parse_signature(buf, size);
+
+ if (size == payload_size) {
+ if (flags & GPG_VERIFY_VERBOSE)
+ write_in_full(1, buf, payload_size);
+ return error("no signature found");
+ }
+
+ ret = check_signature(buf, payload_size, buf + payload_size,
+ size - payload_size, &sigc);
+ print_signature_buffer(&sigc, flags);
+
+ signature_check_clear(&sigc);
+ return ret;
+}
+
+int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
+ unsigned flags)
+{
+ enum object_type type;
+ char *buf;
+ unsigned long size;
+ int ret;
+
+ type = sha1_object_info(sha1, NULL);
+ if (type != OBJ_TAG)
+ return error("%s: cannot verify a non-tag object of type %s.",
+ name_to_report ?
+ name_to_report :
+ find_unique_abbrev(sha1, DEFAULT_ABBREV),
+ typename(type));
+
+ buf = read_sha1_file(sha1, &type, &size);
+ if (!buf)
+ return error("%s: unable to read file.",
+ name_to_report ?
+ name_to_report :
+ find_unique_abbrev(sha1, DEFAULT_ABBREV));
+
+ ret = run_gpg_verify(buf, size, flags);
+
+ free(buf);
+ return ret;
+}
+
struct object *deref_tag(struct object *o, const char *warn, int warnlen)
{
while (o && o->type == OBJ_TAG)
diff --git a/tag.h b/tag.h
index f4580ae..a5721b6 100644
--- a/tag.h
+++ b/tag.h
@@ -17,5 +17,7 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si
extern int parse_tag(struct tag *item);
extern struct object *deref_tag(struct object *, const char *, int);
extern struct object *deref_tag_noverify(struct object *);
+extern int gpg_verify_tag(const unsigned char *sha1,
+ const char *name_to_report, unsigned flags);
#endif /* TAG_H */
diff --git a/test-match-trees.c b/test-match-trees.c
deleted file mode 100644
index 109f03e..0000000
--- a/test-match-trees.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "cache.h"
-#include "tree.h"
-
-int main(int ac, char **av)
-{
- unsigned char hash1[20], hash2[20], shifted[20];
- struct tree *one, *two;
-
- if (get_sha1(av[1], hash1))
- die("cannot parse %s as an object name", av[1]);
- if (get_sha1(av[2], hash2))
- die("cannot parse %s as an object name", av[2]);
- one = parse_tree_indirect(hash1);
- if (!one)
- die("not a tree-ish %s", av[1]);
- two = parse_tree_indirect(hash2);
- if (!two)
- die("not a tree-ish %s", av[2]);
-
- shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
- printf("shifted: %s\n", sha1_to_hex(shifted));
-
- exit(0);
-}
diff --git a/transport-helper.c b/transport-helper.c
index b934183..bd666b2 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1152,7 +1152,7 @@ static void udt_close_if_finished(struct unidirectional_transfer *t)
}
/*
- * Tries to read read data from source into buffer. If buffer is full,
+ * Tries to read data from source into buffer. If buffer is full,
* no data is read. Returns 0 on success, -1 on error.
*/
static int udt_do_read(struct unidirectional_transfer *t)
@@ -1166,7 +1166,7 @@ static int udt_do_read(struct unidirectional_transfer *t)
bytes = read(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse);
if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN &&
errno != EINTR) {
- error("read(%s) failed: %s", t->src_name, strerror(errno));
+ error_errno("read(%s) failed", t->src_name);
return -1;
} else if (bytes == 0) {
transfer_debug("%s EOF (with %i bytes in buffer)",
@@ -1193,7 +1193,7 @@ static int udt_do_write(struct unidirectional_transfer *t)
transfer_debug("%s is writable", t->dest_name);
bytes = xwrite(t->dest, t->buf, t->bufuse);
if (bytes < 0 && errno != EWOULDBLOCK) {
- error("write(%s) failed: %s", t->dest_name, strerror(errno));
+ error_errno("write(%s) failed", t->dest_name);
return -1;
} else if (bytes > 0) {
t->bufuse -= bytes;
@@ -1306,7 +1306,7 @@ static int tloop_join(pid_t pid, const char *name)
{
int tret;
if (waitpid(pid, &tret, 0) < 0) {
- error("%s process failed to wait: %s", name, strerror(errno));
+ error_errno("%s process failed to wait", name);
return 1;
}
if (!WIFEXITED(tret) || WEXITSTATUS(tret)) {
diff --git a/tree-diff.c b/tree-diff.c
index 4dda9a1..ff4e0d3 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -183,7 +183,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
if (t) {
/* path present in resulting tree */
- sha1 = tree_entry_extract(t, &path, &mode);
+ sha1 = tree_entry_extract(t, &path, &mode)->hash;
pathlen = tree_entry_len(&t->entry);
isdir = S_ISDIR(mode);
} else {
@@ -229,7 +229,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
DIFF_STATUS_ADDED;
if (tpi_valid) {
- sha1_i = tp[i].entry.sha1;
+ sha1_i = tp[i].entry.oid->hash;
mode_i = tp[i].entry.mode;
}
else {
@@ -270,7 +270,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
/* same rule as in emitthis */
int tpi_valid = tp && !(tp[i].entry.mode & S_IFXMIN_NEQ);
- parents_sha1[i] = tpi_valid ? tp[i].entry.sha1
+ parents_sha1[i] = tpi_valid ? tp[i].entry.oid->hash
: NULL;
}
@@ -482,7 +482,7 @@ static struct combine_diff_path *ll_diff_tree_paths(
continue;
/* diff(t,pi) != ø */
- if (hashcmp(t.entry.sha1, tp[i].entry.sha1) ||
+ if (oidcmp(t.entry.oid, tp[i].entry.oid) ||
(t.entry.mode != tp[i].entry.mode))
continue;
diff --git a/tree-walk.c b/tree-walk.c
index cd4bb2c..ce27842 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -38,7 +38,7 @@ static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned
/* Initialize the descriptor entry */
desc->entry.path = path;
desc->entry.mode = canon_mode(mode);
- desc->entry.sha1 = (const unsigned char *)(path + len);
+ desc->entry.oid = (const struct object_id *)(path + len);
}
void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size)
@@ -76,7 +76,7 @@ static void entry_extract(struct tree_desc *t, struct name_entry *a)
void update_tree_entry(struct tree_desc *desc)
{
const void *buf = desc->buffer;
- const unsigned char *end = desc->entry.sha1 + 20;
+ const unsigned char *end = desc->entry.oid->hash + 20;
unsigned long size = desc->size;
unsigned long len = end - (const unsigned char *)buf;
@@ -110,7 +110,7 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
pathlen--;
info->pathlen = pathlen ? pathlen + 1 : 0;
info->name.path = base;
- info->name.sha1 = (void *)(base + pathlen + 1);
+ info->name.oid = (void *)(base + pathlen + 1);
if (pathlen)
info->prev = &dummy;
}
@@ -433,10 +433,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
int namelen = strlen(name);
while (t->size) {
const char *entry;
- const unsigned char *sha1;
+ const struct object_id *oid;
int entrylen, cmp;
- sha1 = tree_entry_extract(t, &entry, mode);
+ oid = tree_entry_extract(t, &entry, mode);
entrylen = tree_entry_len(&t->entry);
update_tree_entry(t);
if (entrylen > namelen)
@@ -447,7 +447,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
if (cmp < 0)
break;
if (entrylen == namelen) {
- hashcpy(result, sha1);
+ hashcpy(result, oid->hash);
return 0;
}
if (name[entrylen] != '/')
@@ -455,10 +455,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
if (!S_ISDIR(*mode))
break;
if (++entrylen == namelen) {
- hashcpy(result, sha1);
+ hashcpy(result, oid->hash);
return 0;
}
- return get_tree_entry(sha1, name + entrylen, result, mode);
+ return get_tree_entry(oid->hash, name + entrylen, result, mode);
}
return -1;
}
diff --git a/tree-walk.h b/tree-walk.h
index 174eb61..97a7d69 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -2,7 +2,7 @@
#define TREE_WALK_H
struct name_entry {
- const unsigned char *sha1;
+ const struct object_id *oid;
const char *path;
unsigned int mode;
};
@@ -13,16 +13,16 @@ struct tree_desc {
unsigned int size;
};
-static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
{
*pathp = desc->entry.path;
*modep = desc->entry.mode;
- return desc->entry.sha1;
+ return desc->entry.oid;
}
static inline int tree_entry_len(const struct name_entry *ne)
{
- return (const char *)ne->sha1 - ne->path - 1;
+ return (const char *)ne->oid - ne->path - 1;
}
void update_tree_entry(struct tree_desc *);
diff --git a/tree.c b/tree.c
index f79ff98..0089e52 100644
--- a/tree.c
+++ b/tree.c
@@ -76,7 +76,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
continue;
}
- switch (fn(entry.sha1, base,
+ switch (fn(entry.oid->hash, base,
entry.path, entry.mode, stage, context)) {
case 0:
continue;
@@ -87,19 +87,19 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
}
if (S_ISDIR(entry.mode))
- hashcpy(sha1, entry.sha1);
+ hashcpy(sha1, entry.oid->hash);
else if (S_ISGITLINK(entry.mode)) {
struct commit *commit;
- commit = lookup_commit(entry.sha1);
+ commit = lookup_commit(entry.oid->hash);
if (!commit)
die("Commit %s in submodule path %s%s not found",
- sha1_to_hex(entry.sha1),
+ oid_to_hex(entry.oid),
base->buf, entry.path);
if (parse_commit(commit))
die("Invalid commit %s in submodule path %s%s",
- sha1_to_hex(entry.sha1),
+ oid_to_hex(entry.oid),
base->buf, entry.path);
hashcpy(sha1, commit->tree->object.oid.hash);
diff --git a/unpack-trees.c b/unpack-trees.c
index 9f55cc2..6bc9512 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -58,40 +58,74 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
int i;
const char **msgs = opts->msgs;
const char *msg;
- const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
- if (advice_commit_before_merge)
- msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
- "Please, commit your changes or stash them before you can %s.";
+ if (!strcmp(cmd, "checkout"))
+ msg = advice_commit_before_merge
+ ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
+ "Please commit your changes or stash them before you can switch branches.")
+ : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
+ else if (!strcmp(cmd, "merge"))
+ msg = advice_commit_before_merge
+ ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
+ "Please commit your changes or stash them before you can merge.")
+ : _("Your local changes to the following files would be overwritten by merge:\n%%s");
else
- msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
+ msg = advice_commit_before_merge
+ ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
+ "Please commit your changes or stash them before you can %s.")
+ : _("Your local changes to the following files would be overwritten by %s:\n%%s");
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
- xstrfmt(msg, cmd, cmd2);
+ xstrfmt(msg, cmd, cmd);
msgs[ERROR_NOT_UPTODATE_DIR] =
- "Updating the following directories would lose untracked files in it:\n%s";
-
- if (advice_commit_before_merge)
- msg = "The following untracked working tree files would be %s by %s:\n%%s"
- "Please move or remove them before you can %s.";
+ _("Updating the following directories would lose untracked files in it:\n%s");
+
+ if (!strcmp(cmd, "checkout"))
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be removed by checkout:\n%%s"
+ "Please move or remove them before you can switch branches.")
+ : _("The following untracked working tree files would be removed by checkout:\n%%s");
+ else if (!strcmp(cmd, "merge"))
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be removed by merge:\n%%s"
+ "Please move or remove them before you can merge.")
+ : _("The following untracked working tree files would be removed by merge:\n%%s");
else
- msg = "The following untracked working tree files would be %s by %s:\n%%s";
-
- msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, "removed", cmd, cmd2);
- msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, "overwritten", cmd, cmd2);
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be removed by %s:\n%%s"
+ "Please move or remove them before you can %s.")
+ : _("The following untracked working tree files would be removed by %s:\n%%s");
+ msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
+
+ if (!strcmp(cmd, "checkout"))
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
+ "Please move or remove them before you can switch branches.")
+ : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
+ else if (!strcmp(cmd, "merge"))
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
+ "Please move or remove them before you can merge.")
+ : _("The following untracked working tree files would be overwritten by merge:\n%%s");
+ else
+ msg = advice_commit_before_merge
+ ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
+ "Please move or remove them before you can %s.")
+ : _("The following untracked working tree files would be overwritten by %s:\n%%s");
+ msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
/*
* Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
* cannot easily display it as a list.
*/
- msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
+ msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
- "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
+ _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
- "The following Working tree files would be overwritten by sparse checkout update:\n%s";
+ _("The following Working tree files would be overwritten by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
- "The following Working tree files would be removed by sparse checkout update:\n%s";
+ _("The following Working tree files would be removed by sparse checkout update:\n%s");
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */
@@ -168,7 +202,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
string_list_clear(rejects, 0);
}
if (something_displayed)
- fprintf(stderr, "Aborting\n");
+ fprintf(stderr, _("Aborting\n"));
}
/*
@@ -475,7 +509,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask,
for (i = 0; i < n; i++, dirmask >>= 1) {
const unsigned char *sha1 = NULL;
if (dirmask & 1)
- sha1 = names[i].sha1;
+ sha1 = names[i].oid->hash;
buf[i] = fill_tree_descriptor(t+i, sha1);
}
@@ -591,7 +625,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
ce->ce_mode = create_ce_mode(n->mode);
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
- hashcpy(ce->sha1, n->sha1);
+ hashcpy(ce->sha1, n->oid->hash);
make_traverse_path(ce->name, info, n);
return ce;
@@ -1499,8 +1533,7 @@ static int verify_absent_1(const struct cache_entry *ce,
path = xmemdupz(ce->name, len);
if (lstat(path, &st))
- ret = error("cannot stat '%s': %s", path,
- strerror(errno));
+ ret = error_errno("cannot stat '%s'", path);
else
ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
&st, error_type, o);
@@ -1508,8 +1541,7 @@ static int verify_absent_1(const struct cache_entry *ce,
return ret;
} else if (lstat(ce->name, &st)) {
if (errno != ENOENT)
- return error("cannot stat '%s': %s", ce->name,
- strerror(errno));
+ return error_errno("cannot stat '%s'", ce->name);
return 0;
} else {
return check_ok_to_remove(ce->name, ce_namelen(ce),
diff --git a/upload-pack.c b/upload-pack.c
index b3f6653..f19444d 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -90,35 +90,32 @@ static void create_pack_file(void)
"corruption on the remote side.";
int buffered = -1;
ssize_t sz;
- const char *argv[13];
- int i, arg = 0;
+ int i;
FILE *pipe_fd;
if (shallow_nr) {
- argv[arg++] = "--shallow-file";
- argv[arg++] = "";
+ argv_array_push(&pack_objects.args, "--shallow-file");
+ argv_array_push(&pack_objects.args, "");
}
- argv[arg++] = "pack-objects";
- argv[arg++] = "--revs";
+ argv_array_push(&pack_objects.args, "pack-objects");
+ argv_array_push(&pack_objects.args, "--revs");
if (use_thin_pack)
- argv[arg++] = "--thin";
+ argv_array_push(&pack_objects.args, "--thin");
- argv[arg++] = "--stdout";
+ argv_array_push(&pack_objects.args, "--stdout");
if (shallow_nr)
- argv[arg++] = "--shallow";
+ argv_array_push(&pack_objects.args, "--shallow");
if (!no_progress)
- argv[arg++] = "--progress";
+ argv_array_push(&pack_objects.args, "--progress");
if (use_ofs_delta)
- argv[arg++] = "--delta-base-offset";
+ argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag)
- argv[arg++] = "--include-tag";
- argv[arg++] = NULL;
+ argv_array_push(&pack_objects.args, "--include-tag");
pack_objects.in = -1;
pack_objects.out = -1;
pack_objects.err = -1;
pack_objects.git_cmd = 1;
- pack_objects.argv = argv;
if (start_command(&pack_objects))
die("git upload-pack: unable to fork git-pack-objects");
@@ -177,8 +174,7 @@ static void create_pack_file(void)
if (ret < 0) {
if (errno != EINTR) {
- error("poll failed, resuming: %s",
- strerror(errno));
+ error_errno("poll failed, resuming");
sleep(1);
}
continue;
diff --git a/usage.c b/usage.c
index 82ff131..1dad03f 100644
--- a/usage.c
+++ b/usage.c
@@ -109,19 +109,11 @@ void NORETURN die(const char *err, ...)
va_end(params);
}
-void NORETURN die_errno(const char *fmt, ...)
+static const char *fmt_with_err(char *buf, int n, const char *fmt)
{
- va_list params;
- char fmt_with_err[1024];
char str_error[256], *err;
int i, j;
- if (die_is_recursing()) {
- fputs("fatal: recursion detected in die_errno handler\n",
- stderr);
- exit(128);
- }
-
err = strerror(errno);
for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {
if ((str_error[j++] = err[i++]) != '%')
@@ -136,13 +128,37 @@ void NORETURN die_errno(const char *fmt, ...)
}
}
str_error[j] = 0;
- snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error);
+ snprintf(buf, n, "%s: %s", fmt, str_error);
+ return buf;
+}
+
+void NORETURN die_errno(const char *fmt, ...)
+{
+ char buf[1024];
+ va_list params;
+
+ if (die_is_recursing()) {
+ fputs("fatal: recursion detected in die_errno handler\n",
+ stderr);
+ exit(128);
+ }
va_start(params, fmt);
- die_routine(fmt_with_err, params);
+ die_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
va_end(params);
}
+int error_errno(const char *fmt, ...)
+{
+ char buf[1024];
+ va_list params;
+
+ va_start(params, fmt);
+ error_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
+ va_end(params);
+ return -1;
+}
+
#undef error
int error(const char *err, ...)
{
@@ -154,6 +170,16 @@ int error(const char *err, ...)
return -1;
}
+void warning_errno(const char *warn, ...)
+{
+ char buf[1024];
+ va_list params;
+
+ va_start(params, warn);
+ warn_routine(fmt_with_err(buf, sizeof(buf), warn), params);
+ va_end(params);
+}
+
void warning(const char *warn, ...)
{
va_list params;
diff --git a/utf8.h b/utf8.h
index 7930b44..6bbcf31 100644
--- a/utf8.h
+++ b/utf8.h
@@ -48,7 +48,7 @@ static inline char *reencode_string(const char *in,
int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding);
/*
- * Returns true if the the path would match ".git" after HFS case-folding.
+ * Returns true if the path would match ".git" after HFS case-folding.
* The path should be NUL-terminated, but we will match variants of both ".git\0"
* and ".git/..." (but _not_ ".../.git"). This makes it suitable for both fsck
* and verify_path().
diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
index 57cc1ce..e416caf 100644
--- a/vcs-svn/line_buffer.c
+++ b/vcs-svn/line_buffer.c
@@ -53,9 +53,9 @@ long buffer_tmpfile_prepare_to_read(struct line_buffer *buf)
{
long pos = ftell(buf->infile);
if (pos < 0)
- return error("ftell error: %s", strerror(errno));
+ return error_errno("ftell error");
if (fseek(buf->infile, 0, SEEK_SET))
- return error("seek error: %s", strerror(errno));
+ return error_errno("seek error");
return pos;
}
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index f11d490..06d273c 100644
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -12,7 +12,7 @@ static int input_error(struct line_buffer *file)
{
if (!buffer_ferror(file))
return error("delta preimage ends early");
- return error("cannot read delta preimage: %s", strerror(errno));
+ return error_errno("cannot read delta preimage");
}
static int skip_or_whine(struct line_buffer *file, off_t gap)
diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
index 74c97c4..75c7531 100644
--- a/vcs-svn/svndiff.c
+++ b/vcs-svn/svndiff.c
@@ -64,13 +64,13 @@ static int write_strbuf(struct strbuf *sb, FILE *out)
{
if (fwrite(sb->buf, 1, sb->len, out) == sb->len) /* Success. */
return 0;
- return error("cannot write delta postimage: %s", strerror(errno));
+ return error_errno("cannot write delta postimage");
}
static int error_short_read(struct line_buffer *input)
{
if (buffer_ferror(input))
- return error("error reading delta: %s", strerror(errno));
+ return error_errno("error reading delta");
return error("invalid delta: unexpected end of file");
}
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 31d1d83..e4b3959 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -501,7 +501,7 @@ static void init(int report_fd)
int svndump_init(const char *filename)
{
if (buffer_init(&input, filename))
- return error("cannot open %s: %s", filename ? filename : "NULL", strerror(errno));
+ return error_errno("cannot open %s", filename ? filename : "NULL");
init(REPORT_FILENO);
return 0;
}
@@ -509,7 +509,7 @@ int svndump_init(const char *filename)
int svndump_init_fd(int in_fd, int back_fd)
{
if(buffer_fdinit(&input, xdup(in_fd)))
- return error("cannot open fd %d: %s", in_fd, strerror(errno));
+ return error_errno("cannot open fd %d", in_fd);
init(xdup(back_fd));
return 0;
}
diff --git a/walker.c b/walker.c
index 08773d4..d95b007 100644
--- a/walker.c
+++ b/walker.c
@@ -43,12 +43,12 @@ static int process_tree(struct walker *walker, struct tree *tree)
if (S_ISGITLINK(entry.mode))
continue;
if (S_ISDIR(entry.mode)) {
- struct tree *tree = lookup_tree(entry.sha1);
+ struct tree *tree = lookup_tree(entry.oid->hash);
if (tree)
obj = &tree->object;
}
else {
- struct blob *blob = lookup_blob(entry.sha1);
+ struct blob *blob = lookup_blob(entry.oid->hash);
if (blob)
obj = &blob->object;
}
diff --git a/wildmatch.c b/wildmatch.c
index f91ba99..57c8765 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -136,7 +136,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
/*
* Try to advance faster when an asterisk is
* followed by a literal. We know in this case
- * that the the string before the literal
+ * that the string before the literal
* must belong to "*".
* If match_slash is false, do not look past
* the first slash as it cannot belong to '*'.
diff --git a/worktree.c b/worktree.c
index 6181a66..199b1ef 100644
--- a/worktree.c
+++ b/worktree.c
@@ -2,6 +2,8 @@
#include "refs.h"
#include "strbuf.h"
#include "worktree.h"
+#include "dir.h"
+#include "wt-status.h"
void free_worktrees(struct worktree **worktrees)
{
@@ -9,7 +11,7 @@ void free_worktrees(struct worktree **worktrees)
for (i = 0; worktrees[i]; i++) {
free(worktrees[i]->path);
- free(worktrees[i]->git_dir);
+ free(worktrees[i]->id);
free(worktrees[i]->head_ref);
free(worktrees[i]);
}
@@ -18,7 +20,7 @@ void free_worktrees(struct worktree **worktrees)
/*
* read 'path_to_ref' into 'ref'. Also if is_detached is not NULL,
- * set is_detached to 1 (0) if the ref is detatched (is not detached).
+ * set is_detached to 1 (0) if the ref is detached (is not detached).
*
* $GIT_COMMON_DIR/$symref (e.g. HEAD) is practically outside $GIT_DIR so
* for linked worktrees, `resolve_ref_unsafe()` won't work (it uses
@@ -74,13 +76,11 @@ static struct worktree *get_main_worktree(void)
struct worktree *worktree = NULL;
struct strbuf path = STRBUF_INIT;
struct strbuf worktree_path = STRBUF_INIT;
- struct strbuf gitdir = STRBUF_INIT;
struct strbuf head_ref = STRBUF_INIT;
int is_bare = 0;
int is_detached = 0;
- strbuf_addf(&gitdir, "%s", absolute_path(get_git_common_dir()));
- strbuf_addbuf(&worktree_path, &gitdir);
+ strbuf_addstr(&worktree_path, absolute_path(get_git_common_dir()));
is_bare = !strbuf_strip_suffix(&worktree_path, "/.git");
if (is_bare)
strbuf_strip_suffix(&worktree_path, "/.");
@@ -92,15 +92,15 @@ static struct worktree *get_main_worktree(void)
worktree = xmalloc(sizeof(struct worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
- worktree->git_dir = strbuf_detach(&gitdir, NULL);
+ worktree->id = NULL;
worktree->is_bare = is_bare;
worktree->head_ref = NULL;
worktree->is_detached = is_detached;
+ worktree->is_current = 0;
add_head_info(&head_ref, worktree);
done:
strbuf_release(&path);
- strbuf_release(&gitdir);
strbuf_release(&worktree_path);
strbuf_release(&head_ref);
return worktree;
@@ -111,16 +111,13 @@ static struct worktree *get_linked_worktree(const char *id)
struct worktree *worktree = NULL;
struct strbuf path = STRBUF_INIT;
struct strbuf worktree_path = STRBUF_INIT;
- struct strbuf gitdir = STRBUF_INIT;
struct strbuf head_ref = STRBUF_INIT;
int is_detached = 0;
if (!id)
die("Missing linked worktree name");
- strbuf_addf(&gitdir, "%s/worktrees/%s",
- absolute_path(get_git_common_dir()), id);
- strbuf_addf(&path, "%s/gitdir", gitdir.buf);
+ strbuf_git_common_path(&path, "worktrees/%s/gitdir", id);
if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0)
/* invalid gitdir file */
goto done;
@@ -140,20 +137,39 @@ static struct worktree *get_linked_worktree(const char *id)
worktree = xmalloc(sizeof(struct worktree));
worktree->path = strbuf_detach(&worktree_path, NULL);
- worktree->git_dir = strbuf_detach(&gitdir, NULL);
+ worktree->id = xstrdup(id);
worktree->is_bare = 0;
worktree->head_ref = NULL;
worktree->is_detached = is_detached;
+ worktree->is_current = 0;
add_head_info(&head_ref, worktree);
done:
strbuf_release(&path);
- strbuf_release(&gitdir);
strbuf_release(&worktree_path);
strbuf_release(&head_ref);
return worktree;
}
+static void mark_current_worktree(struct worktree **worktrees)
+{
+ struct strbuf git_dir = STRBUF_INIT;
+ struct strbuf path = STRBUF_INIT;
+ int i;
+
+ strbuf_addstr(&git_dir, absolute_path(get_git_dir()));
+ for (i = 0; worktrees[i]; i++) {
+ struct worktree *wt = worktrees[i];
+ strbuf_addstr(&path, absolute_path(get_worktree_git_dir(wt)));
+ wt->is_current = !fspathcmp(git_dir.buf, path.buf);
+ strbuf_reset(&path);
+ if (wt->is_current)
+ break;
+ }
+ strbuf_release(&git_dir);
+ strbuf_release(&path);
+}
+
struct worktree **get_worktrees(void)
{
struct worktree **list = NULL;
@@ -185,35 +201,105 @@ struct worktree **get_worktrees(void)
}
ALLOC_GROW(list, counter + 1, alloc);
list[counter] = NULL;
+
+ mark_current_worktree(list);
return list;
}
-char *find_shared_symref(const char *symref, const char *target)
+const char *get_worktree_git_dir(const struct worktree *wt)
+{
+ if (!wt)
+ return get_git_dir();
+ else if (!wt->id)
+ return get_git_common_dir();
+ else
+ return git_common_path("worktrees/%s", wt->id);
+}
+
+int is_worktree_being_rebased(const struct worktree *wt,
+ const char *target)
+{
+ struct wt_status_state state;
+ int found_rebase;
+
+ memset(&state, 0, sizeof(state));
+ found_rebase = wt_status_check_rebase(wt, &state) &&
+ ((state.rebase_in_progress ||
+ state.rebase_interactive_in_progress) &&
+ state.branch &&
+ starts_with(target, "refs/heads/") &&
+ !strcmp(state.branch, target + strlen("refs/heads/")));
+ free(state.branch);
+ free(state.onto);
+ return found_rebase;
+}
+
+int is_worktree_being_bisected(const struct worktree *wt,
+ const char *target)
{
- char *existing = NULL;
+ struct wt_status_state state;
+ int found_rebase;
+
+ memset(&state, 0, sizeof(state));
+ found_rebase = wt_status_check_bisect(wt, &state) &&
+ state.branch &&
+ starts_with(target, "refs/heads/") &&
+ !strcmp(state.branch, target + strlen("refs/heads/"));
+ free(state.branch);
+ return found_rebase;
+}
+
+/*
+ * note: this function should be able to detect shared symref even if
+ * HEAD is temporarily detached (e.g. in the middle of rebase or
+ * bisect). New commands that do similar things should update this
+ * function as well.
+ */
+const struct worktree *find_shared_symref(const char *symref,
+ const char *target)
+{
+ const struct worktree *existing = NULL;
struct strbuf path = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
- struct worktree **worktrees = get_worktrees();
+ static struct worktree **worktrees;
int i = 0;
+ if (worktrees)
+ free_worktrees(worktrees);
+ worktrees = get_worktrees();
+
for (i = 0; worktrees[i]; i++) {
+ struct worktree *wt = worktrees[i];
+
+ if (wt->is_detached && !strcmp(symref, "HEAD")) {
+ if (is_worktree_being_rebased(wt, target)) {
+ existing = wt;
+ break;
+ }
+ if (is_worktree_being_bisected(wt, target)) {
+ existing = wt;
+ break;
+ }
+ }
+
strbuf_reset(&path);
strbuf_reset(&sb);
- strbuf_addf(&path, "%s/%s", worktrees[i]->git_dir, symref);
+ strbuf_addf(&path, "%s/%s",
+ get_worktree_git_dir(wt),
+ symref);
if (parse_ref(path.buf, &sb, NULL)) {
continue;
}
if (!strcmp(sb.buf, target)) {
- existing = xstrdup(worktrees[i]->path);
+ existing = wt;
break;
}
}
strbuf_release(&path);
strbuf_release(&sb);
- free_worktrees(worktrees);
return existing;
}
diff --git a/worktree.h b/worktree.h
index b4b3dda..1394909 100644
--- a/worktree.h
+++ b/worktree.h
@@ -3,11 +3,12 @@
struct worktree {
char *path;
- char *git_dir;
+ char *id;
char *head_ref;
unsigned char head_sha1[20];
int is_detached;
int is_bare;
+ int is_current;
};
/* Functions for acting on the information about worktrees. */
@@ -23,16 +24,33 @@ struct worktree {
extern struct worktree **get_worktrees(void);
/*
+ * Return git dir of the worktree. Note that the path may be relative.
+ * If wt is NULL, git dir of current worktree is returned.
+ */
+extern const char *get_worktree_git_dir(const struct worktree *wt);
+
+/*
* Free up the memory for worktree(s)
*/
extern void free_worktrees(struct worktree **);
/*
* Check if a per-worktree symref points to a ref in the main worktree
- * or any linked worktree, and return the path to the exising worktree
- * if it is. Returns NULL if there is no existing ref. The caller is
- * responsible for freeing the returned path.
+ * or any linked worktree, and return the worktree that holds the ref,
+ * or NULL otherwise. The result may be destroyed by the next call.
+ */
+extern const struct worktree *find_shared_symref(const char *symref,
+ const char *target);
+
+int is_worktree_being_rebased(const struct worktree *wt, const char *target);
+int is_worktree_being_bisected(const struct worktree *wt, const char *target);
+
+/*
+ * Similar to git_path() but can produce paths for a specified
+ * worktree instead of current one
*/
-extern char *find_shared_symref(const char *symref, const char *target);
+extern const char *worktree_git_path(const struct worktree *wt,
+ const char *fmt, ...)
+ __attribute__((format (printf, 2, 3)));
#endif
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index db0ec6a..22b6e49 100644
--- a/wrap-for-bin.sh
+++ b/wrap-for-bin.sh
@@ -17,6 +17,7 @@ fi
GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}"
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
+
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
if test -n "$GIT_TEST_GDB"
diff --git a/wrapper.c b/wrapper.c
index 9afc1a0..5dc4e15 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -446,23 +446,6 @@ int git_mkstemp(char *path, size_t len, const char *template)
return mkstemp(path);
}
-/* git_mkstemps() - create tmp file with suffix honoring TMPDIR variable. */
-int git_mkstemps(char *path, size_t len, const char *template, int suffix_len)
-{
- const char *tmp;
- size_t n;
-
- tmp = getenv("TMPDIR");
- if (!tmp)
- tmp = "/tmp";
- n = snprintf(path, len, "%s/%s", tmp, template);
- if (len <= n) {
- errno = ENAMETOOLONG;
- return -1;
- }
- return mkstemps(path, suffix_len);
-}
-
/* Adapted from libiberty's mkstemp.c. */
#undef TMP_MAX
@@ -572,7 +555,7 @@ static int warn_if_unremovable(const char *op, const char *file, int rc)
if (!rc || errno == ENOENT)
return 0;
err = errno;
- warning("unable to %s %s: %s", op, file, strerror(errno));
+ warning_errno("unable to %s %s", op, file);
errno = err;
return rc;
}
@@ -608,7 +591,7 @@ int remove_or_warn(unsigned int mode, const char *file)
void warn_on_inaccessible(const char *path)
{
- warning(_("unable to access '%s': %s"), path, strerror(errno));
+ warning_errno(_("unable to access '%s'"), path);
}
static int access_error_is_ok(int err, unsigned flag)
diff --git a/wt-status.c b/wt-status.c
index ef74864..4f27bd6 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -15,6 +15,7 @@
#include "column.h"
#include "strbuf.h"
#include "utf8.h"
+#include "worktree.h"
static const char cut_line[] =
"------------------------ >8 ------------------------\n";
@@ -950,6 +951,7 @@ static void show_merge_in_progress(struct wt_status *s,
status_printf_ln(s, color,
_(" (fix conflicts and run \"git commit\")"));
} else {
+ s-> commitable = 1;
status_printf_ln(s, color,
_("All conflicts fixed but you are still merging."));
if (s->hints)
@@ -1063,9 +1065,7 @@ static void abbrev_sha1_in_line(struct strbuf *line)
strbuf_addf(line, "%s", split[i]->buf);
}
}
- for (i = 0; split[i]; i++)
- strbuf_release(split[i]);
-
+ strbuf_list_free(split);
}
static void read_rebase_todolist(const char *fname, struct string_list *lines)
@@ -1264,13 +1264,13 @@ static void show_bisect_in_progress(struct wt_status *s,
/*
* Extract branch information from rebase/bisect
*/
-static char *read_and_strip_branch(const char *path)
+static char *get_branch(const struct worktree *wt, const char *path)
{
struct strbuf sb = STRBUF_INIT;
unsigned char sha1[20];
const char *branch_name;
- if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0)
+ if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0)
goto got_nothing;
while (sb.len && sb.buf[sb.len - 1] == '\n')
@@ -1362,40 +1362,62 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
strbuf_release(&cb.buf);
}
-void wt_status_get_state(struct wt_status_state *state,
- int get_detached_from)
+int wt_status_check_rebase(const struct worktree *wt,
+ struct wt_status_state *state)
{
struct stat st;
- unsigned char sha1[20];
- if (!stat(git_path_merge_head(), &st)) {
- state->merge_in_progress = 1;
- } else if (!stat(git_path("rebase-apply"), &st)) {
- if (!stat(git_path("rebase-apply/applying"), &st)) {
+ if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) {
+ if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) {
state->am_in_progress = 1;
- if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
+ if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size)
state->am_empty_patch = 1;
} else {
state->rebase_in_progress = 1;
- state->branch = read_and_strip_branch("rebase-apply/head-name");
- state->onto = read_and_strip_branch("rebase-apply/onto");
+ state->branch = get_branch(wt, "rebase-apply/head-name");
+ state->onto = get_branch(wt, "rebase-apply/onto");
}
- } else if (!stat(git_path("rebase-merge"), &st)) {
- if (!stat(git_path("rebase-merge/interactive"), &st))
+ } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) {
+ if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st))
state->rebase_interactive_in_progress = 1;
else
state->rebase_in_progress = 1;
- state->branch = read_and_strip_branch("rebase-merge/head-name");
- state->onto = read_and_strip_branch("rebase-merge/onto");
+ state->branch = get_branch(wt, "rebase-merge/head-name");
+ state->onto = get_branch(wt, "rebase-merge/onto");
+ } else
+ return 0;
+ return 1;
+}
+
+int wt_status_check_bisect(const struct worktree *wt,
+ struct wt_status_state *state)
+{
+ struct stat st;
+
+ if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) {
+ state->bisect_in_progress = 1;
+ state->branch = get_branch(wt, "BISECT_START");
+ return 1;
+ }
+ return 0;
+}
+
+void wt_status_get_state(struct wt_status_state *state,
+ int get_detached_from)
+{
+ struct stat st;
+ unsigned char sha1[20];
+
+ if (!stat(git_path_merge_head(), &st)) {
+ state->merge_in_progress = 1;
+ } else if (wt_status_check_rebase(NULL, state)) {
+ ; /* all set */
} else if (!stat(git_path_cherry_pick_head(), &st) &&
!get_sha1("CHERRY_PICK_HEAD", sha1)) {
state->cherry_pick_in_progress = 1;
hashcpy(state->cherry_pick_head_sha1, sha1);
}
- if (!stat(git_path("BISECT_LOG"), &st)) {
- state->bisect_in_progress = 1;
- state->branch = read_and_strip_branch("BISECT_START");
- }
+ wt_status_check_bisect(NULL, state);
if (!stat(git_path_revert_head(), &st) &&
!get_sha1("REVERT_HEAD", sha1)) {
state->revert_in_progress = 1;
diff --git a/wt-status.h b/wt-status.h
index c9b3b74..2ca93f6 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -6,6 +6,8 @@
#include "color.h"
#include "pathspec.h"
+struct worktree;
+
enum color_wt_status {
WT_STATUS_HEADER = 0,
WT_STATUS_UPDATED,
@@ -100,6 +102,10 @@ void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);
void wt_status_get_state(struct wt_status_state *state, int get_detached_from);
+int wt_status_check_rebase(const struct worktree *wt,
+ struct wt_status_state *state);
+int wt_status_check_bisect(const struct worktree *wt,
+ struct wt_status_state *state);
void wt_shortstatus_print(struct wt_status *s);
void wt_porcelain_print(struct wt_status *s);
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 4fb7e79..7423f77 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -41,6 +41,8 @@ extern "C" {
#define XDF_IGNORE_BLANK_LINES (1 << 7)
+#define XDF_COMPACTION_HEURISTIC (1 << 8)
+
#define XDL_EMIT_FUNCNAMES (1 << 0)
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 2358a2d..b3c6848 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -400,9 +400,23 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
}
+static int is_blank_line(xrecord_t **recs, long ix, long flags)
+{
+ return xdl_blankline(recs[ix]->ptr, recs[ix]->size, flags);
+}
+
+static int recs_match(xrecord_t **recs, long ixs, long ix, long flags)
+{
+ return (recs[ixs]->ha == recs[ix]->ha &&
+ xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size,
+ recs[ix]->ptr, recs[ix]->size,
+ flags));
+}
+
int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec;
char *rchg = xdf->rchg, *rchgo = xdfo->rchg;
+ unsigned int blank_lines;
xrecord_t **recs = xdf->recs;
/*
@@ -436,14 +450,14 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
do {
grpsiz = ix - ixs;
+ blank_lines = 0;
/*
* If the line before the current change group, is equal to
* the last line of the current change group, shift backward
* the group.
*/
- while (ixs > 0 && recs[ixs - 1]->ha == recs[ix - 1]->ha &&
- xdl_recmatch(recs[ixs - 1]->ptr, recs[ixs - 1]->size, recs[ix - 1]->ptr, recs[ix - 1]->size, flags)) {
+ while (ixs > 0 && recs_match(recs, ixs - 1, ix - 1, flags)) {
rchg[--ixs] = 1;
rchg[--ix] = 0;
@@ -470,8 +484,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the line next of the current change group, shift forward
* the group.
*/
- while (ix < nrec && recs[ixs]->ha == recs[ix]->ha &&
- xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, recs[ix]->ptr, recs[ix]->size, flags)) {
+ while (ix < nrec && recs_match(recs, ixs, ix, flags)) {
+ blank_lines += is_blank_line(recs, ix, flags);
+
rchg[ixs++] = 0;
rchg[ix++] = 1;
@@ -498,6 +513,23 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
rchg[--ix] = 0;
while (rchgo[--ixo]);
}
+
+ /*
+ * If a group can be moved back and forth, see if there is a
+ * blank line in the moving space. If there is a blank line,
+ * make sure the last blank line is the end of the group.
+ *
+ * As we already shifted the group forward as far as possible
+ * in the earlier loop, we need to shift it back only if at all.
+ */
+ if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
+ while (ixs > 0 &&
+ !is_blank_line(recs, ix - 1, flags) &&
+ recs_match(recs, ixs - 1, ix - 1, flags)) {
+ rchg[--ixs] = 1;
+ rchg[--ix] = 0;
+ }
+ }
}
return 0;
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 63a22c6..13b55ab 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -301,10 +301,11 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdl_free_ctx(&xe->xdf2);
xdl_free_ctx(&xe->xdf1);
+ xdl_free_classifier(&cf);
return -1;
}
- if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
+ if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
xdl_free_classifier(&cf);
return 0;