snix/po/git.pot
Vincent Ambo 8518a7a51f Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2
7397ca3373 Git 2.25.4
b86a4be245 Git 2.24.3
f2771efd07 Git 2.23.3
c9808fa014 Git 2.22.4
9206d27eb5 Git 2.21.3
041bc65923 Git 2.20.4
76b54ee9b9 Git 2.19.5
ba6f0905fd Git 2.18.4
df5be6dc3f Git 2.17.5
1a3609e402 fsck: reject URL with empty host in .gitmodules
e7fab62b73 credential: treat URL with empty scheme as invalid
c44088ecc4 credential: treat URL without scheme as invalid
fe29a9b7b0 credential: die() when parsing invalid urls
a2b26ffb1a fsck: convert gitmodules url to URL passed to curl
8ba8ed568e credential: refuse to operate when missing host or protocol
24036686c4 credential: parse URL without host as empty host, not unset
73aafe9bc2 t0300: use more realistic inputs
a88dbd2f8c t0300: make "quit" helper more realistic
de49261b05 Git 2.26.1
274b9cc253 Git 2.26
55a7568606 Merge branch 'en/rebase-backend'
c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git
1557364fb4 l10n: tr.po: change file mode to 644
2da1b05674 t3419: prevent failure when run with EXPENSIVE
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0
5804c6ec40 l10n: de.po: add missing space
98cedd0233 Merge https://github.com/prati0100/git-gui
4914ba4bcf l10n: tr: Fix a couple of ambiguities
a5728022e0 Merge branch 'py/remove-tcloo'
7fcb965970 RelNotes/2.26.0: fix various typos
f0c03bcf95 l10n: Update Catalan translation
67b0a24910 Git 2.25.3
be8661a328 Sync with Git 2.25.2
0822e66b5d Git 2.25.2
65588b0b2e unicode: update the width tables to Unicode 13.0
7be274b0ff Merge branch 'js/ci-windows-update' into maint
9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint
221887a492 Merge branch 'jk/doc-credential-helper' into maint
32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint
fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint
618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint
50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint
fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint
41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint
2d7247af6f Merge branch 'am/mingw-poll-fix' into maint
4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint
76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint
569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
16a4bf1035 Merge branch 'en/check-ignore' into maint
3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint
56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint
1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint
7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint
fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint
a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint
93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint
dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint
758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint
f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint
506223f9c5 Git 2.24.2
17a02783d8 Git 2.23.2
69fab82147 Git 2.22.3
fe22686494 Git 2.21.2
d1259ce117 Git 2.20.3
a5979d7009 Git 2.19.4
21a3e5016b Git 2.18.3
c42c0f1297 Git 2.17.4
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u)
3891a84ccd git-gui: create a new namespace for chord script evaluation
8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2
6c85aac65f Git 2.26-rc2
74f172e39e Merge branch 'en/test-cleanup'
e96327c947 Merge branch 'es/outside-repo-errmsg-hints'
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0
15fa8d9667 l10n: vi: fix translation + grammar
5c20398699 prefix_path: show gitdir if worktree unavailable
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)
a4a2f64642 Merge branch 'js/askpass-coerce-utf8'
850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows
d769dcc5cd Merge branch 'py/blame-status-error'
70e24186c0 t6022, t6046: fix flaky files-are-updated checks
30e9940356 Hopefully the final batch before -rc2
b4f0038525 Merge branch 'en/rebase-backend'
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master
07259e74ec fsck: detect gitmodules URLs with embedded newlines
c716fe4bd9 credential: detect unrepresentable values when parsing urls
17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr
9a6bbee800 credential: avoid writing values with newlines
17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2
1afe18a3bb l10n: es: 2.26.0 round#2
5ab9217a3c Merge branch of github.com:alshopov/git-po into master
c6713676d6 Merge branch of github.com:bitigchi/git-po into master
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t)
2713dec02d l10n: tr: v2.26.0 round 2
c9ef57cc3a l10n: fr : v2.26.0 rnd 2
120b1eb731 git-rebase.txt: highlight backend differences with commit rewording
9a1b7474d6 sequencer: clear state upon dropping a become-empty commit
937d143630 i18n: unmark a message in rebase.c
a56d361f66 Merge branch 'ds/sparse-add'
5fa9169ced Merge branch 'dr/push-remote-ref-update'
cdef998b46 Merge branch 'jc/doc-single-h-is-for-help'
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)
52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master
9643441983 l10n: tr: Add glossary for Turkish translations
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u)
dd2c269652 l10n: tr: Add Turkish translations
8f4f099f8b l10n: tr: Add Turkish translation team info
b4374e96c8 Git 2.26-rc1
4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch'
3658d77f8e Merge branch 'hd/show-one-mergetag-fix'
6125104b88 Merge branch 'rt/format-zero-length-fix'
1ac37deba2 Merge branch 'am/mingw-poll-fix'
cf372dc815 Merge branch 'en/test-cleanup'
d1075adfdf Merge branch 'en/merge-path-collision'
a4fd114ffc Merge branch 'kk/complete-diff-color-moved'
a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file'
0e0d717537 Merge branch 'pb/am-show-current-patch'
9b7f726dfc Merge branch 'am/pathspec-f-f-more'
4605a73073 t1091: don't grep for `strerror()` string
4d9c2902a1 l10n: fr v2.26.0 rnd1
ad182bee3f Merge branch of github.com:alshopov/git-po into master
23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t)
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)
76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po
076cbdcd73 Git 2.26-rc0
0d65f3fb1a t5537: adjust test_oid label
e63cefb024 Merge branch 'hi/gpg-use-check-signature'
5da7329e29 Merge branch 'rs/commit-graph-code-simplification'
0108fc1b46 Merge branch 'js/ci-windows-update'
f3ccd9f0d9 Merge branch 'be/describe-multiroot'
a6b4709302 Merge branch 'ag/rebase-remove-redundant-code'
b22db265d6 Merge branch 'es/recursive-single-branch-clone'
e8e71848ea Merge branch 'jk/nth-packed-object-id'
a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere'
49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix'
2cbb058669 Merge branch 'bc/wildcard-credential'
25063e2530 Merge branch 'mr/bisect-in-c-1'
f4d7dfce4d Merge branch 'ds/sparse-add'
4d864895a2 t2402: test worktree path when called in .git directory
af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch()
7655b4119d remote-curl: show progress for fetches over dumb HTTP
2f268890c2 The eighth batch for 2.26
aa5a7e02ad Merge branch 'ma/test-cleanup'
58595e713c Merge branch 'rs/blame-typefix-for-fingerprint'
ff41848e99 Merge branch 'rs/micro-cleanups'
4cbf1a0e22 Merge branch 'es/worktree-cleanup'
46703057c1 Merge branch 'ak/test-log-graph'
777815f5f9 Merge branch 'jk/run-command-formatfix'
444cff61b4 Merge branch 'ds/partial-clone-fixes'
48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure'
8c22bd9ff9 Merge branch 'en/rebase-backend'
cb2f5a8e97 Merge branch 'en/check-ignore'
0df82d99da Merge branch 'jk/object-filter-with-bitmap'
80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix'
29b09c518c Merge branch 'jk/doc-diff-parallel'
237a28173f show_one_mergetag: print non-parent in hex form.
5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context"
6d1210e133 l10n: Update Catalan translation
0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification"
7329d94be7 config.mak.dev: re-enable -Wformat-zero-length
7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings
94f4d01932 mingw: workaround for hangs when sending STDIN
1ff466c018 Documentation: clarify that `-h` alone stands for `help`
65bf820d0e t6020: new test with interleaved lexicographic ordering of directories
9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it
d5bb92eced t3035: prefer test_must_fail to bash negation for git commands
b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions
42d180dd01 t602[1236], t6034: modernize test formatting
802050400a merge-recursive: apply collision handling unification to recursive case
7f487ce062 Azure Pipeline: switch to the latest agent pools
5ed9fc3fc8 ci: prevent `perforce` from being quarantined
eafff6e41e t/lib-httpd: avoid using macOS' sed
d68ce906c7 commit-graph: use progress title directly
30b1c7ad9d describe: don't abort too early when searching tags
240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to'
2d2118b814 The seventh batch for 2.26
325eb66830 Merge branch 'es/doc-mentoring'
87f17d790d Merge branch 'es/bright-colors'
d0038f4b31 Merge branch 'bw/remote-rename-update-config'
132f600b06 clone: pass --single-branch during --recurse-submodules
47319576f1 submodule--helper: use C99 named initializer
ffe005576a lib-log-graph: consolidate colored graph cmp logic
989eea958b lib-log-graph: consolidate test_cmp_graph logic
bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching
bb4995fc3f worktree: add utility to find worktree by pathname
a80c4c2214 worktree: improve find_worktree() documentation
2fecc48cad packfile: drop nth_packed_object_sha1()
6ac9760a30 packed_object_info(): use object_id internally for delta base
b99b6bcc57 packed_object_info(): use object_id for returning delta base
63f4a7fc01 pack-check: push oid lookup into loop
e31c71083a pack-check: convert "internal error" die to a BUG()
500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps
f66d4e0250 pack-objects: use object_id struct in pack-reuse code
a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id
3f83fd5e44 pack-objects: read delta base oid into object_id struct
0763671b8e nth_packed_object_oid(): use customary integer return
02bbbe9df9 worktree: drop unused code from get_main_worktree()
27f182b3fc blame: provide type of fingerprints pointer
b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere
df126ca142 t3400: make test clean up after itself
3c29e21eb0 t: drop debug `cat` calls
cac439b56d t9810: drop debug `cat` call
91de82adc9 t4117: check for files using `test_path_is_file`
4ef346482d receive.denyCurrentBranch: respect all worktrees
f8692114db t5509: use a bare repository for test push target
45f274fbb1 get_main_worktree(): allow it to be called in the Git directory
fd0bc17557 completion: add diff --color-moved[-ws]
2ce6d075fa use strpbrk(3) to search for characters from a given set
2b3c430bce quote: use isalnum() to check for alphanumeric characters
a51d9e8f07 t1050: replace test -f with test_path_is_file
3e96c66805 partial-clone: avoid fetching when looking for objects
d0badf8797 partial-clone: demonstrate bugs in partial fetch
539052f42f run-command.h: fix mis-indented struct member
6c11c6a124 sparse-checkout: allow one-character directories in cone mode
aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch
e8ef1e8d6e am: convert "resume" variable to a struct
bc8620b440 parse-options: convert "command mode" to a flag
62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE()
46fd7b3900 credential: allow wildcard patterns when matching config
82eb249853 credential: use the last matching username in the config
588c70e10f t0300: add tests for some additional cases
732f934408 t1300: add test for urlmatch with multiple wildcards
3fa0e04667 mailmap: add an additional email address for brian m. carlson
8a98758a8d stash push: support the --pathspec-from-file option
8c3713cede stash: eliminate crude option parsing
3f3d8068f5 doc: stash: synchronize <pathspec> description
b22909144c doc: stash: document more options
0093abc286 doc: stash: split options from description (2)
2b7460d167 doc: stash: split options from description (1)
5f393dc3aa rm: support the --pathspec-from-file option
fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags
73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure
6c69f22233 bisect: libify `bisect_next_all`
9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents
45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents
cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents
e8e3ce6718 bisect: libify `bisect_checkout`
ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents
7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()`
680e8a01e5 bisect: add enum to represent bisect returning codes
bfacfce7d9 bisect--helper: introduce new `decide_next()` function
b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0
292731c4c2 bisect--helper: change `retval` to `res`
16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays
7ec8125fba check-ignore: fix documentation and implementation to match
2607d39da3 doc-diff: use single-colon rule in rendering Makefile
0aa6ce3094 doc/config/push: use longer "--" line for preformatted example
20a5fd881a rev-list --count: comment on the use of count_right++
63a58457e0 Merge branch 'py/missing-bracket'
51ebf55b93 The sixth batch for 2.26
f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints'
123538444f Merge branch 'jk/doc-credential-helper'
e154451a2f Merge branch 'js/mingw-open-in-gdb'
fc25a19265 Merge branch 'js/test-unc-fetch'
6365058605 Merge branch 'js/test-avoid-pipe'
966b69f02f Merge branch 'js/test-write-junit-xml-fix'
d880c3de23 Merge branch 'jk/mailinfo-cleanup'
5d55554b1d Merge branch 'mr/show-config-scope'
9f3f38769d Merge branch 'rs/strbuf-insertstr'
cbecc168d4 Merge branch 'rs/parse-options-concat-dup'
5af345a438 Merge branch 'bc/hash-independent-tests-part-8'
0460c109c3 Merge branch 'rs/name-rev-memsave'
6b9919c0a2 git-gui: add missing close bracket
5897e5ac96 Merge branch 'cs/german-translation'
cf85a32eb6 git-gui: update German translation
5096e51c54 git-gui: extend translation glossary template with more terms
8b85bb1b70 git-gui: update pot template and German translation to current source code
e68e29171c Sync with 2.25.1
c522f061d5 Git 2.25.1
10cdb9f38a rebase: rename the two primary rebase backends
2ac0d6273f rebase: change the default backend from "am" to "merge"
8295ed690b rebase: make the backend configurable via config setting
76340c8107 rebase tests: repeat some tests using the merge backend instead of am
980b482d28 rebase tests: mark tests specific to the am-backend with --am
c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases
6d04ce75c4 git-prompt: change the prompt for interactive-based rebases
52eb738d6b rebase: add an --am option
8af14f0859 rebase: move incompatibility checks between backend options a bit earlier
be50c938df git-rebase.txt: add more details about behavioral differences of backends
befb89ce7c rebase: allow more types of rebases to fast-forward
9a70f3d4ae t3432: make these tests work with either am or merge backends
93122c985a rebase: fix handling of restrict_revision
55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer
8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling
7db00f0b3b t3406: simplify an already simple test
e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty
d48e5e21da rebase (interactive-backend): make --keep-empty the default
e0020b2f82 prefix_path: show gitdir when arg is outside repo
cc4f2eb828 doc: move credential helper info into gitcredentials(7)
bfdd66e72f Sync with maint
7ae7e234c7 The fifth batch for 2.26
53c3be2c29 Merge branch 'tb/commit-graph-object-dir'
7b029ebaef Merge branch 'jk/index-pack-dupfix'
aa21cc97bd Merge branch 'jk/alloc-cleanups'
883326077a Merge branch 'jh/notes-fanout-fix'
f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule'
78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs'
df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
433b8aac2e Merge branch 'ds/sparse-checkout-harden'
4a77434bc8 Merge branch 'ld/p4-cleanup-processes'
8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone'
09e48400a3 Merge branch 'jk/get-oid-error-message-i18n'
4dbeecba27 Merge branch 'ag/edit-todo-drop-check'
f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2'
d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout'
251187084d Merge branch 'js/rebase-i-with-colliding-hash'
c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix'
56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store'
0da63da794 Merge branch 'jn/promote-proto2-to-default'
a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup'
daef1b300b Merge branch 'hw/advice-add-nothing'
6141e0cc00 Merge branch 'js/convert-typofix' into maint
4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint
5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint
b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
7137d6089b Merge branch 'ms/doc-bundle-format' into maint
52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint
0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint
1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint
cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint
153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint
8857657cc9 Merge branch 'jt/t5616-robustify' into maint
1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint
f468972671 Merge branch 'bc/misconception-doc' into maint
6e69042e26 Merge branch 'bc/author-committer-doc' into maint
650ed395be Merge branch 'ds/refmap-doc' into maint
80b806f1a8 Merge branch 'bc/actualmente' into maint
eceff4ba12 Merge branch 'rt/submodule-i18n' into maint
8a17eb7972 Merge branch 'jk/test-fixes' into maint
54bbadaeca Merge branch 'jk/asan-build-fix' into maint
8dbeba198e Merge branch 'ds/sparse-cone' into maint
e361f36f61 Merge branch 'nd/switch-and-restore' into maint
4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint
ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint
c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint
d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint
9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint
3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint
3ab3185f99 pack-objects: support filters with bitmaps
84243da129 pack-bitmap: implement BLOB_LIMIT filtering
4f3bd5606a pack-bitmap: implement BLOB_NONE filtering
cc4aa28506 bitmap: add bitmap_unset() function
2aaeb9ac41 rev-list: use bitmap filters for traversal
6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure
4eb707ebd6 rev-list: allow commit-only bitmap traversals
ea047a8eb4 t5310: factor out bitmap traversal comparison
608d9c9365 rev-list: allow bitmaps when counting objects
55cb10f9b5 rev-list: make --count work with --objects
792f811998 rev-list: factor out bitmap-optimized routines
d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs
08809c09aa mingw: add a helper function to attach GDB to the current process
bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths
de26f02db1 t9001, t9116: avoid pipes
a2dc43414c MyFirstContribution: rephrase contact info
e03f928e2a rev-list: fallback to non-bitmap traversal when filtering
acac50dd8c pack-bitmap: fix leak of haves/wants object lists
551cf8b655 pack-bitmap: factor out type iterator initialization
d8437c57fa The fourth batch for 2.26
a3dcf84df0 Merge branch 'js/convert-typofix'
0de2d1409b Merge branch 'js/ci-squelch-doc-warning'
0410c2ba31 Merge branch 'jb/multi-pack-index-docfix'
0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example'
e99c325bb4 Merge branch 'ms/doc-bundle-format'
afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix'
db72f8c940 Merge branch 'jb/parse-options-message-fix'
3d2471ba85 Merge branch 'ma/filter-branch-doc-caret'
b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path'
44cba9c4b3 Merge branch 'jc/skip-prefix'
556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index'
17e4a1b141 Merge branch 'hw/doc-git-dir'
4cf7f48891 Merge branch 'jk/push-default-doc'
b783391018 Merge branch 'jk/clang-sanitizer-fixes'
a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache'
3f7553acf5 Merge branch 'jt/t5616-robustify'
341f8a6476 Merge branch 'jk/escaped-wildcard-dwim'
b486d2ee81 Merge branch 'jn/pretend-object-doc'
076ee3e8a2 tests: fix --write-junit-xml with subshells
2b0f19fa7a convert: fix typo
c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors
1751b09a92 color.c: support bright aixterm colors
4a28eb0ae4 color.c: refactor color_output arguments
f696a2b1c8 mailinfo: factor out some repeated header handling
ffbea1816d mailinfo: be more liberal with header whitespace
f447d0293e mailinfo: simplify parsing of header values
b6537d83ee mailinfo: treat header values as C strings
ef07659926 sparse-checkout: work with Windows paths
2631dc879d sparse-checkout: create 'add' subcommand
4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand
6fb705abcb sparse-checkout: extract add_patterns_from_input()
b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config
f2a2327a4a config: provide access to the current line number
923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values
ceff1a1308 remote: clean-up config callback
1a83068c26 remote: clean-up by returning early to avoid one indentation
88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
145d59f482 config: add '--show-scope' to print the scope of a config value
9a83d088ee submodule-config: add subomdule config scope
e37efa40e1 config: teach git_config_source to remember its scope
5c105a842e config: preserve scope in do_git_config_sequence
6766e41b8a config: clarify meaning of command line scoping
6dc905d974 config: split repo scope to local and worktree
a5cb4204b6 config: make scope_name non-static and rename it
30183894ea ci: ignore rubygems warning in the "Documentation" job
7a9f8ca805 parse-options: simplify parse_options_dup()
c84078573e parse-options: const parse_options_concat() parameters
f904f9025f parse-options: factor out parse_options_count()
a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat()
517b60564e mailinfo: don't insert header prefix for handle_content_type()
a91cc7fad0 strbuf: add and use strbuf_insertstr()
eb31044ff7 pack-format: correct multi-pack-index description
9299f84921 diff-options.txt: avoid "regex" overload in example
7378ec90e1 doc: describe Git bundle format
f3037657e8 t6024: update for SHA-256
edf04243b2 t6006: make hash size independent
5db24dcffd t6000: abstract away SHA-1-specific constants
d341e0805d t5703: make test work with SHA-256
88ed241a7e t5607: make hash size independent
48c10cc0e6 t5318: update for SHA-256
f7ae8e69b6 t5515: make test hash independent
e70649bb66 t5321: make test hash independent
a30f93b143 t5313: make test hash independent
a79eec220b t5309: make test hash independent
796d1383a3 t5302: make hash size independent
417e45e5e3 t4060: make test work with SHA-256
dfa5f53e78 t4211: add test cases for SHA-256
f743e8f5b3 t4211: move SHA-1-specific test cases into a directory
72f936b120 t4013: make test hash independent
5df0f11f07 t3311: make test work with SHA-256
07877f393c t3310: make test work with SHA-256
6025e898d6 t3309: make test work with SHA-256
7b1a1822fe t3308: make test work with SHA-256
94db7e3e93 t3206: make hash size independent
db12505c2c t/lib-pack: support SHA-256
303b3c1c46 submodule: add newline on invalid submodule error
887a0fd573 add: change advice config variables used by the add API
de93cc14ab The third batch for 2.26
ea46d9097b Merge branch 'mt/sparse-checkout-doc-update'
ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix'
b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend'
7ab963e122 Merge branch 'en/fill-directory-fixes-more'
f52ab33616 Merge branch 'bc/hash-independent-tests-part-7'
25794d6ce9 Merge branch 'km/submodule-add-errmsg'
d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
76c57fedfa Merge branch 'js/add-p-leftover-bits'
9a5315edfd Merge branch 'js/patch-mode-in-others-in-c'
381e8e9de1 Merge branch 'dl/test-must-fail-fixes'
395518cf7a parse-options: lose an unnecessary space in an error message
079f970971 name-rev: sort tip names before applying
2d53975488 name-rev: release unused name strings
977dc1912b name-rev: generate name strings only if they are better
1c56fc2084 name-rev: pre-size buffer in get_parent_name()
ddc42ec786 name-rev: factor out get_parent_name()
f13ca7cef5 name-rev: put struct rev_name into commit slab
d689d6d82f name-rev: don't _peek() in create_or_update_name()
15a4205d96 name-rev: don't leak path copy in name_ref()
36d2419c9a name-rev: respect const qualifier
71620ca86c name-rev: remove unused typedef
3e2feb0d64 name-rev: rewrite create_or_update_name()
a21781011f index-pack: downgrade twice-resolved REF_DELTA to die()
dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout
e1c5253951 t3305: check notes fanout more carefully and robustly
e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks
a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
ad2dd5bb63 commit-graph.c: remove path normalization, comparison
13c2499249 commit-graph.h: store object directory in 'struct commit_graph'
0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context'
f38c92452d t7400: testcase for submodule status on unregistered inner git repos
5290d45134 tree-walk.c: break circular dependency with unpack-trees
f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch
d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode
e53ffe2704 sparse-checkout: escape all glob characters on write
e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand
bd64de42de sparse-checkout: unquote C-style strings over --stdin
d585f0e799 sparse-checkout: write escaped patterns in cone mode
4f52c2ce6c sparse-checkout: properly match escaped characters
9abc60f801 sparse-checkout: warn on globs in cone patterns
145136a95a C: use skip_prefix() to avoid hardcoded string length
04e5b3f0b4 submodule foreach: replace $path with $sm_path in example
1793280e91 t5318: don't pass non-object directory to '--object-dir'
da8063522f diff: move diff.wsErrorHighlight to "basic" config
b98d188581 sha1-file: allow check_object_signature() to handle any repo
2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file()
7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare()
c8123e72f6 streaming: allow open_istream() to handle any repo
5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile()
a651946730 cache-tree: use given repo's hash_algo at verify_one()
eb999b3295 diff: make diff_populate_filespec() honor its repo argument
5b0ca878e0 Sync with maint
344ee18728 The second batch
53a83299c7 Merge branch 'bc/misconception-doc'
c9ccf9d09b Merge branch 'bc/author-committer-doc'
0d0fa20c40 Merge branch 'ss/t6025-modernize'
7050624abc Merge branch 'lh/bool-to-type-bool'
4b69f29271 Merge branch 'ds/refmap-doc'
aff812ce3c Merge branch 'bc/actualmente'
38fb56e92a Merge branch 'rt/submodule-i18n'
f0940743fa Merge branch 'js/builtin-add-i-cmds'
0afeb3fdf4 Merge branch 'jk/test-fixes'
808dab2b58 Merge branch 'jk/asan-build-fix'
fec1ff97c2 Merge branch 'sg/completion-worktree'
c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function'
11ad30b887 Merge branch 'hi/gpg-mintrustlevel'
96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases'
d52adee779 Merge branch 'ds/graph-horizontal-edges'
6909474491 Merge branch 'am/update-pathspec-f-f-tests'
043426c8fd Merge branch 'ds/sparse-cone'
34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig'
8dd40c0472 traverse_trees(): use stack array for name entries
667b76ec58 walker_fetch(): avoid raw array length computation
9734b74a8f normalize_path_copy(): document "dst" size expectations
43f33e492a git-p4: avoid leak of file handle when cloning
19fa5ac333 git-p4: check for access to remote host earlier
6026aff5bb git-p4: cleanup better on error exit
ca5b5cce62 git-p4: create helper function importRevisions()
4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable
5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce
837b3a6376 git-p4: make closeStreams() idempotent
b0418303b1 sha1-name: mark get_oid() error messages for translation
2df1aa239c fetch: forgo full connectivity check if --filter
50033772d5 connected: verify promisor-ness of partial clone
d82ad54945 git: update documentation for --git-dir
0ad7144999 .mailmap: map Yi-Jyun Pan's email
c56c48dd07 grep: ignore --recurse-submodules if --no-index is given
8b2a1928f0 doc: drop "explicitly given" from push.default description
cf82bff73f obstack: avoid computing offsets from NULL pointer
3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer
d20bc01a51 avoid computing zero offsets from NULL pointer
7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero
bc3f657f71 t1506: drop space after redirection operator
e5d7b2f65c t1400: avoid "test" string comparisons
5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c
c7a6207591 Sync with maint
7210ca4ee5 .mailmap: fix GGG authoship screwup
37a63faae5 t4124: only mark git command with test_must_fail
a8c663cf65 t3507: use test_path_is_missing()
2def7f017c t3507: fix indentation
e8a1c686ae t3504: do check for conflict marker after failed cherry-pick
1c9fd32fd2 t3419: stop losing return code of git command
c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}()
a781cd6fef t3415: stop losing return codes of git commands
86ce6e0dd1 t3310: extract common notes_merge_files_gone()
245b9ba0ba t3030: use test_path_is_missing()
4a6f11fd7b t2018: replace "sha" with "oid"
62e80fcb48 t2018: don't lose return code of git commands
30c0367668 t2018: teach do_checkout() to accept `!` arg
40caa5366a t2018: be more discerning when checking for expected exit codes
b54128bb0b t5616: make robust to delta base change
4c616c2ba1 merge-recursive: use subtraction to flip stage
ee798742bd merge-recursive: silence -Wxor-used-as-pow warning
39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule
a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin
3b2885ec9b submodule: fix status of initialized but not cloned submodules
ace912bfb8 t7400: add a testcase for submodule status on empty dirs
4bb4fd4290 MyFirstContribution: add avenues for getting help
9e6d3e6417 sparse-checkout: detect short patterns
41de0c6fbc sparse-checkout: cone mode does not recognize "**"
7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone
47dbf10d8a clone: fix --sparse option with URLs
3c754067a1 sparse-checkout: create leading directories
d622c34396 t1091: improve here-docs
522e641748 t1091: use check_files to reduce boilerplate
417be08d02 t1300: create custom config file without special characters
3de7ee369b t1300: fix over-indented HERE-DOCs
329e6ec397 config: fix typo in variable name
767a9c417e rebase -i: stop checking out the tip of the branch to rebase
dfaed02862 fsmonitor: update documentation for hook version and watchman hooks
e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2
d031049da3 completion: add support for sparse-checkout
a402723e48 doc: sparse-checkout: mention --cone option
26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
b6992261de rebase -i: re-fix short SHA-1 collision
d859dcad94 parse_insn_line(): improve error message when parsing failed
d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects
92fb0db94c pack-objects: add checks for duplicate objects
bb514de356 pack-objects: improve partial packfile reuse
ff483026a9 builtin/pack-objects: introduce obj_is_packed()
e704fc7978 pack-objects: introduce pack.allowPackReuse
2f4af77699 csum-file: introduce hashfile_total()
8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile
40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains()
14fbd26044 ewah/bitmap: introduce bitmap_word_alloc()
bc7a3d4dc0 The first batch post 2.25 cycle
09e393d913 Merge branch 'nd/switch-and-restore'
45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport'
0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout'
36da2a8635 Merge branch 'es/unpack-trees-oob-fix'
42096c778d Merge branch 'bc/run-command-nullness-after-free-fix'
1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted'
a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees'
e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached'
9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting'
237a83a943 Merge branch 'dl/credential-netrc'
a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir()
129510a067 t2405: clarify test descriptions and simplify test
4eaadc8493 t2405: use git -C and test_commit -C instead of subshells
773c60a45e t7410: rename to t2405-worktree-submodule.sh
7a2dc95cbc docs: mention when increasing http.postBuffer is valuable
1b13e9032f doc: dissuade users from trying to ignore tracked files
69e104d70e doc: provide guidance on user.name format
813f6025a5 docs: expand on possible and recommended user config options
bc94e5862a doc: move author and committer information to git-commit(1)
7979dfe1d4 l10n: Update Catalan translation
81e3db42f3 templates: fix deprecated type option `--bool`
c513a958b6 t6025: use helpers to replace test -f <path>
70789843bd t6025: modernize style
6a7aca6f01 doc: rm: synchronize <pathspec> description
856249c62a docs: use "currently" for the present time
b40a50264a fetch: document and test --refmap=""
a9ae8fde2e t3404: directly test the behavior of interest
22a69fda19 git-rebase.txt: update description of --allow-empty-message
f1928f04b2 grep: use no. of cores as the default no. of threads
70a9fef240 grep: move driver pre-load out of critical section
1184a95ea2 grep: re-enable threads in non-worktree case
6c307626f1 grep: protect packed_git [re-]initialization
c441ea4edc grep: allow submodule functions to run in parallel
d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules()
1d1729caeb grep: replace grep_read_mutex by internal obj read lock
31877c9aec object-store: allow threaded access to object reading
b1fc9da1c8 replace-object: make replace operations thread-safe
d5b0bac528 grep: fix racy calls in grep_objects()
faf123c730 grep: fix race conditions at grep_submodule()
c3a5bb31c1 grep: fix race conditions on userdiff calls
0222540827 fetch: emphasize failure during submodule fetch
232378479e Sync with maint
e4837b4406 t7800: don't rely on reuse_worktree_file()
fbce03d329 t4018: drop "debugging" cat from hunk-header tests
f65d07fffa Makefile: use compat regex with SANITIZE=address
849e43cc18 built-in add -i: accept open-ended ranges again
d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files
a4ffbbbb99 submodule.c: mark more strings for translation
0cbb60574e dir: point treat_leading_path() warning to the right place
ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent
22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2
f365bf40a0 clean: demonstrate a bug with pathspecs
b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
277eb5af7c t5604: make hash independent
44b6c05b43 t5601: switch into repository to hash object
7a868c51c2 t5562: use $ZERO_OID
1b8f39fb0d t5540: make hash size independent
a8c17e3bd6 t5537: make hash size independent
832072219c t5530: compute results based on object length
74ad99b1d8 t5512: abstract away SHA-1-specific constants
ba1be1ab45 t5510: make hash size independent
cba472d3ad t5504: make hash algorithm independent
82d5aeb1e6 t5324: make hash size independent
3c5e65cac1 t5319: make test work with SHA-256
235d3cddb8 t5319: change invalid offset for SHA-256 compatibility
1d86c8f0ce t5318: update for SHA-256
525a7f1769 t4300: abstract away SHA-1-specific constants
7a1bcb251b t4204: make hash size independent
cb78f4f0fe t4202: abstract away SHA-1-specific constants
717c939d8f t4200: make hash size independent
08a9dd891c t4134: compute appropriate length constant
215b60bf07 t4066: compute index line in diffs
194264c185 t4054: make hash-size independent
7d5ecd775d completion: list paths and refs for 'git worktree add'
3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands
3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options
367efd54b3 completion: return the index of found word from __git_find_on_cmdline()
d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function
2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper
54887b4689 gpg-interface: add minTrustLevel as a configuration option
684ceae32d fetch: default to protocol version 2
33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
b9ab170752 config doc: protocol.version is not experimental
07ef3c6604 fetch test: use more robust test for filtered objects
d6509da620 fetch test: mark test of "skipping" haves as v0-only
a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too
c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function
bf66db37f1 add: use advise function to display hints
c958d3bd0a graph: fix collapse of multiple edges
8588932e20 graph: add test to demonstrate horizontal line bug
d0d0a357a1 t: directly test parse_pathspec_file()
568cabb2fe t: fix quotes tests for --pathspec-from-file
f94f7bd00d t: add tests for error conditions with --pathspec-from-file
b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job
12acdf573a built-in add -p: handle Escape sequences more efficiently
e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode
04f816b125 built-in add -p: respect the `interactive.singlekey` config setting
a5e46e6b01 terminal: add a new function to read a single keystroke
9ea416cb51 terminal: accommodate Git for Windows' default terminal
94ac3c31f7 terminal: make the code of disable_echo() reusable
08b1ea4c39 built-in add -p: handle diff.algorithm
180f48df69 built-in add -p: support interactive.diffFilter
1e4ffc765d t3701: adjust difffilter test
c81638541c submodule add: show 'add --dry-run' stderr when aborting
8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token
56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token
d0654dc308 Git 2.25
b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'"
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master
1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
d78a1968c5 Merge branch 'ma/config-advice-markup-fix'
a20ae3ee29 l10n: Update Catalan translation
49e268e23e mingw: safeguard better against backslashes in file names
4c6c7971e0 unpack-trees: correctly compute result count
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1
75449c1b39 l10n: de.po: Reword generation numbers
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t)
3901d2c6bd config/advice.txt: fix description list separator
7a6a90c6ec Git 2.25-rc2
1f5f3ffe5c Merge branch 'ds/graph-assert-fix'
a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix'
202f68b252 Merge branch 'pm/am-in-body-header-doc-update'
7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix'
c5dc20638b Merge branch 'do/gitweb-typofix-in-comments'
fe47c9cb5f Merge https://github.com/prati0100/git-gui
a1087c9367 graph: fix lack of color in horizontal lines
0d251c3291 graph: drop assert() for merge with two collapsing parents
4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper
573117dfa5 unpack-trees: watch for out-of-range index position
e701bab3e9 restore: invalidate cache-tree when removing entries with --staged
1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command
fa74180d08 checkout: don't revert file on ambiguous tracking branches
2957709bd4 parse_branchname_arg(): extract part as new function
5020f6806a t2018: improve style of if-statement
7ffb54618b t2018: add space between function name and ()
63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH
065027ee1a string-list: note in docs that callers can specify sorting function
26f924d50e unpack-trees: exit check_updates() early if updates are not wanted
042ed3e048 The final batch before -rc2
0f1930cd1b Merge branch 'ds/sparse-cone'
037f067587 Merge branch 'ds/commit-graph-set-size-mult'
f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify'
c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode'
a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
c4117fcb97 Merge branch 'pb/clarify-line-log-doc'
556f0258df Merge branch 'ew/packfile-syscall-optim'
5814d44d9b doc: submodule: fix typo for command absorbgitdirs
7047f75f22 editorconfig: indent text files with tabs
60440d72db sha1-file: document how to use pretend_object_file
7fdc5f296f l10n: es: 2.25.0 round #1
f8740c586b am: document that Date: can appear as an in-body header
4e2c4c0d4f gitweb: fix a couple spelling errors in comments
421c0ffb02 multi-pack-index: correct configuration in documentation
757ff352bd Documentation/git-sparse-checkout.txt: fix a typo
0d2116c644 Merge branch 'zs/open-current-file'
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u)
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
4c5081614c l10n: fr.po v2.25.0 rnd 1
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0
63020f175f commit-graph: prefer default size_mult when given zero
224c7d70fa mingw: only test index entries for backslashes, not tree entries
9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED
8679ef24ed Git 2.25-rc1
a82027e9e6 Merge branch 'js/use-test-tool-on-path'
13432fc6dd Merge branch 'js/mingw-reserved-filenames'
e0e1ac5db0 Merge branch 'en/rebase-signoff-fix'
b76a244c9d Merge branch 'em/freebsd-cirrus-ci'
bc855232bc Merge branch 'bk/p4-misc-usability'
763a59e71c merge-recursive: remove unnecessary oid_eq function
44143583b7 sparse-checkout: use extern for global variables
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1
786f4d2405 git-gui: allow opening currently selected file in default app
4fd683b6a3 sparse-checkout: document interactions with submodules
de11951b03 sparse-checkout: list directories in cone mode
0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)
173fff68da Merge tag 'v2.25.0-rc0' into git-po-master
f1842ff531 t2018: remove trailing space from test description
20a67e8ce9 t3008: find test-tool through path lookup
9e341f62ca l10n: Update Catalan translation
4e61b2214d packfile: replace lseek+read with pread
ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision
2be45868a8 doc: log, gitk: document accepted line-log diff formats
280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD
0a76bd7381 mailmap: mask accentless variant for Công Danh
99c33bed56 Git 2.25-rc0
d2189a721c Merge branch 'en/fill-directory-fixes'
8be0a428d6 Merge branch 'rs/test-cleanup'
65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string'
c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
45b96a6fa1 Merge branch 'js/add-p-in-c'
ccc292e862 Merge branch 'jc/drop-gen-hdrs'
dfee504bee Merge branch 'ja/doc-markup-cleanup'
87cbb1ca66 Merge branch 'rs/ref-read-cleanup'
20aa6d88b7 Merge branch 'rb/p4-lfs'
fcd5b55f56 Merge branch 'pb/submodule-doc-xref'
4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free'
ba6b66281e Merge branch 'ln/userdiff-elixir'
bd72a08d6c Merge branch 'ds/sparse-cone'
f3c520e17f Merge branch 'sg/name-rev-wo-recursion'
6514ad40a1 Merge branch 'ra/t5150-depends-on-perl'
17066bea38 Merge branch 'dl/format-patch-notes-config-fixup'
135365dd99 Merge branch 'am/pathspec-f-f-checkout'
ff0cb70d45 Merge branch 'am/pathspec-from-file'
4dc42c6c18 mingw: refuse paths containing reserved names
98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16
c480eeb574 commit --interactive: make it work with the built-in `add -i`
cee6cb7300 built-in add -p: implement the "worktree" patch modes
52628f94fc built-in add -p: implement the "checkout" patch modes
6610e4628a built-in stash: use the built-in `git add -p` if so configured
90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting
36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes
d2a233cb8b built-in add -p: prepare for patch modes other than "stage"
761e3d26bb sparse-checkout: improve OS ls compatibility
6579d93a97 contrib/credential/netrc: work outside a repo
1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable
b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI
b441717256 t1507: inline full_name()
9291e6329e t1507: run commands within test_expect_success
5236fce6b4 t1507: stop losing return codes of git commands
10812c2337 t1501: remove use of `test_might_fail cp`
62d58cda69 t1409: use test_path_is_missing()
b87b02cfe6 t1409: let sed open its own input file
9b92070e52 t1307: reorder `nongit test_must_fail`
3595d10c26 t1306: convert `test_might_fail rm` to `rm -f`
f511bc02ed t0020: use ! check_packed_refs_marked
f6041abdcd t0020: don't use `test_must_fail has_cr`
f46c243e66 t0003: don't use `test_must_fail attr_check`
99c049bc4c t0003: use test_must_be_empty()
3738439c77 t0003: use named parameters in attr_check()
7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err()
b8afb908c2 t/lib-git-p4: use test_path_is_missing()
4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases
6836d2fe06 dir.c: use st_add3() for allocation size
c847dfafee dir: consolidate similar code in treat_directory()
777b420347 dir: synchronize treat_leading_path() and read_directory_recursive()
b9670c1f5e dir: fix checks on common prefix directory
5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit
23cbe427c4 Merge branch 'py/console-close-esc'
124a895811 t4015: improve coverage of function context test
509efef789 commit: forbid --pathspec-from-file --all
12029dc57d t3434: mark successful test as such
e0f9095aaa notes.h: fix typos in comment
675ef6bab8 t6030: don't create unused file
01ed17dc8c t5580: don't create unused file
f670adb49b t3501: don't create unused file
1e1ccbfdd3 git-gui: allow closing console window with Escape
7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays.
b02fd2acca The sixth batch
59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex'
e3b72391d1 Merge branch 'rs/commit-export-env-simplify'
43bf44e23a Merge branch 'rs/archive-zip-code-cleanup'
4438a1a59f Merge branch 'js/t3404-indent-fix'
3a44db2ed2 Merge branch 'dr/branch-usage-casefix'
8bc481f4f6 Merge branch 'sg/t9300-robustify'
011fc2e88e Merge branch 'js/add-i-a-bit-more-tests'
d1c0fe8d9b Merge branch 'dl/range-diff-with-notes'
26c816a67d Merge branch 'hw/doc-in-header'
f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context'
71a7de7a99 Merge branch 'dl/rebase-with-autobase'
c9f5fc9114 Merge branch 'dl/test-cleanup'
6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap'
3beff388b2 Merge branch 'js/builtin-add-i-cmds'
4755a34c47 Merge branch 'dd/time-reentrancy'
37c2619d91 Merge branch 'ag/sequencer-todo-updates'
608e380502 git-p4: show detailed help when parsing options fail
e2aed5fd5b git-p4: yes/no prompts should sanitize user text
571fb96573 fix-typo: consecutive-word duplications
f371984613 Makefile: drop GEN_HDRS
2e4083198d built-in add -p: show helpful hint when nothing can be staged
54d9d9b2ee built-in add -p: only show the applicable parts of the help text
ade246efed built-in add -p: implement the 'q' ("quit") command
d6cf873340 built-in add -p: implement the '/' ("search regex") command
9254bdfb4f built-in add -p: implement the 'g' ("goto") command
bcdd297b78 built-in add -p: implement hunk editing
b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf"
11f2c0dae8 built-in add -p: coalesce hunks after splitting them
510aeca199 built-in add -p: implement the hunk splitting feature
0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions
5906d5de77 built-in app -p: allow selecting a mode change as a "hunk"
47dc4fd5eb built-in add -p: handle deleted empty files
80399aec5a built-in add -p: support multi-file diffs
7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed
12c24cf850 built-in add -p: color the prompt and the help text
25ea47af49 built-in add -p: adjust hunk headers as needed
e3bd11b4eb built-in add -p: show colored hunks by default
1942ee44e8 built-in add -i: wire up the new C code for the `patch` command
f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C
d1b1384d61 userdiff: remove empty subexpression from elixir regex
df5be01669 doc: indent multi-line items in list
fd5041e127 doc: remove non pure ASCII characters
190a65f9db sparse-checkout: respect core.ignoreCase in cone mode
1d7297513d notes: break set_display_notes() into smaller functions
66f79ee23d config/format.txt: clarify behavior of multiple format.notes
cc2bd5c45d gitmodules: link to gitsubmodules guide
99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed
e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed
8c02fe6060 t7004: don't create unused file
cb05d6a5ed t4256: don't create unused file
c5c4eddd56 dir: break part of read_directory_recursive() out for reuse
072a231016 dir: exit before wildcard fall-through if there is no wildcard
2f5d3847d4 dir: remove stray quote character in comment
a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories"
452efd11fb t3011: demonstrate directory traversal failures
ea94b16fb8 git-p4: honor lfs.storage configuration variable
51a0a4ed95 bisect--helper: avoid use-after-free
d32e065a91 Merge branch 'kk/branch-name-encoding'
ad05a3d8e5 The fifth batch
7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix'
b089e5e6cb Merge branch 'em/test-skip-regex-illseq'
930078ba39 Merge branch 'hi/gpg-use-check-signature'
08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk'
55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm'
41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress'
5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise'
dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix'
d37cfe3b5c Merge branch 'dl/pretty-reference'
99c4ff1bda Merge branch 'dl/submodule-set-url'
55d607d85b Merge branch 'js/mingw-inherit-only-std-handles'
c58ae96fc4 Merge branch 'am/pathspec-from-file'
7c88714262 Merge branch 'po/bundle-doc-clonable'
5d9324e0f4 Merge branch 'ra/rebase-i-more-options'
7034cd094b Sync with Git 2.24.1
09ac67a183 format-patch: move git_config() before repo_init_revisions()
8164c961e1 format-patch: use --notes behavior for format.notes
452538c358 notes: extract logic into set_display_notes()
e6e230eeae notes: create init_display_notes() helper
1e6ed5441a notes: rename to load_display_notes()
2866fd284c name-rev: cleanup name_ref()
49f7a2fde9 name-rev: eliminate recursion in name_rev()
fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name'
e05e8cf074 archive-zip: use enum for compression method
39acfa3d22 git gui: fix branch name encoding error
11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description
8cf8f9b4aa t3404: fix indentation
4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs
147ee35558 commit: use strbuf_add() to add a length-limited string
559c6fc317 The fourth batch
56e6c16394 Merge branch 'dl/lore-is-the-archive'
3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive'
7cb0d37f6d Merge branch 'tg/perf-remove-stale-result'
403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick'
f0cf2fee5d Merge branch 'hi/grep-do-not-return-void'
391fb22ac7 Merge branch 'rs/use-skip-prefix-more'
92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd'
4ba74ca901 Merge branch 'rs/test-cleanup'
f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9'
8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters
3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances
dd432a6ecf name-rev: restructure parsing commits and applying date cutoff
dd090a8a37 name-rev: pull out deref handling from the recursion
766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper
d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev()
bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation
e0c4da6f2a name-rev: avoid unnecessary cast in name_ref()
c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name()
c593a26348 t6120-describe: modernize the 'check_describe' helper
abcf857300 range-diff: clear `other_arg` at end of function
f8675343d7 range-diff: mark pointers as const
828765dfe0 t3206: fix incorrect test name
0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early
21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile
b4bbbbd5a2 apply --allow-overlap: fix a corner case
89c8559367 git add -p: use non-zero exit code when the diff generation failed
e91162be9c t3701: verify that the diff.algorithm config setting is handled
0c3222c4f3 t3701: verify the shown messages when nothing can be added
24be352d52 t3701: add a test for the different `add -p` prompts
8539b46534 t3701: avoid depending on the TTY prerequisite
0f0fba2cc8 t3701: add a test for advanced split-hunk editing
53a06cf39b Git 2.24.1
67af91c47a Sync with 2.23.1
a7312d1a28 Git 2.23.1
7fd9fd94fb Sync with 2.22.2
d9589d4051 Git 2.22.2
5421ddd8d0 Sync with 2.21.1
367f12b7e9 Git 2.21.1
20c71bcf67 Merge branch 'fix-msys2-quoting-bugs'
7d8b676992 mingw: sh arguments need quoting in more circumstances
d9061ed9da t7415: drop v2.20.x-specific work-around
04522edbd4 mingw: fix quoting of empty arguments for `sh`
49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts
e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly
fc346cb292 Sync with 2.20.2
4cd1cf31ef Git 2.20.2
c154745074 submodule: defend against submodule.update = !command in .gitmodules
4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x
d851d94151 Sync with 2.19.3
caccc527ca Git 2.19.3
7c9fbda6e2 Sync with 2.18.2
9877106b01 Git 2.18.2
14af7ed5a9 Sync with 2.17.3
a5ab8d0317 Git 2.17.3
bb92255ebe fsck: reject submodule.update = !command in .gitmodules
bdfef0492c Sync with 2.16.6
eb288bc455 Git 2.16.6
68440496c7 test-drop-caches: use `has_dos_drive_prefix()`
9ac92fed5b Sync with 2.15.4
7cdafcaacf Git 2.15.4
e904deb89d submodule: reject submodule.update = !command in .gitmodules
d3ac8c3f27 Sync with 2.14.6
66d2a6159f Git 2.14.6
083378cc35 The third batch
88bd37a2d0 Merge branch 'js/pkt-line-h-typofix'
473b431410 Merge branch 'us/unpack-trees-fsmonitor'
e0f9ec9027 Merge branch 'sg/test-bool-env'
fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset'
e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere'
88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory'
8feb47e882 Merge branch 'dl/t5520-cleanup'
6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree'
57d46bc602 Merge branch 'mg/doc-submodule-status-cached'
75bd003c7b Merge branch 'js/git-svn-use-rebase-merges'
f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix'
c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree'
cf91c31688 Merge branch 'sg/unpack-progress-throughput'
ef6104581d Merge branch 'pb/submodule-update-fetches'
7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix'
f3c7bfdde2 Merge branch 'dl/range-diff-with-notes'
9502b616f1 Merge branch 'jh/userdiff-python-async'
76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2'
995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label'
f7998d9793 Merge branch 'js/builtin-add-i'
917d0d6234 Merge branch 'js/rebase-r-safer-label'
56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers'
2763530048 Merge branch 'jg/revert-untracked'
fa38ab68b0 git-gui: revert untracked files by deleting them
d9c6469f38 git-gui: update status bar to track operations
29a9366052 git-gui: consolidate naming conventions
0bb313a552 xdiff: unignore changes in function context
2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names'
65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
5532ebdeb7 Merge branch 'fix-mingw-quoting-bug'
76a681ce9c Merge branch 'dubiously-nested-submodules'
dd53ea7220 Merge branch 'turn-on-protectntfs-by-default'
f82a97eb91 mingw: handle `subst`-ed "DOS drives"
7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'
d2c84dad1c mingw: refuse to access paths with trailing spaces or periods
379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh
817ddd64c2 mingw: refuse to access paths with illegal characters
cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors
7530a6287e quote-stress-test: allow skipping some trials
35edce2056 t6130/t9350: prepare for stringent Win32 path validation
55953c77c0 quote-stress-test: accept arguments to test via the command-line
ad15592529 tests: add a helper to stress test argument quoting
a8dee3ca61 Disallow dubiously-nested submodule git directories
9102f958ee protect_ntfs: turn on NTFS protection by default
91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams
6d8684161e mingw: fix quoting of arguments
3a85dc7d53 is_ntfs_dotgit(): speed it up
7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses
288a74bcd2 is_ntfs_dotgit(): only verify the leading segment
a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark
cae0bc09ab rebase: fix format.useAutoBase breakage
945dc55dda format-patch: teach --no-base
700e006c5d t4014: use test_config()
a749d01e1d format-patch: fix indentation
0c47e06176 t3400: demonstrate failure with format.useAutoBase
d9b31db2c4 t7700: stop losing return codes of git commands
3699d69df0 t7700: make references to SHA-1 generic
dcf9a748ca t7700: replace egrep with grep
cfe5eda02a t7700: consolidate code into test_has_duplicate_object()
ae475afc0f t7700: consolidate code into test_no_missing_in_packs()
14b7664df8 doc: replace LKML link with lore.kernel.org
d23f9c8e04 RelNotes: replace Gmane with real Message-IDs
dcee037228 doc: replace MARC links with lore.kernel.org
a9aecc7abb checkout, restore: support the --pathspec-from-file option
cfd9376c1d doc: restore: synchronize <pathspec> description
8ea1189eac doc: checkout: synchronize <pathspec> description
6fdc9ad259 doc: checkout: fix broken text reference
1d022bb43f doc: checkout: remove duplicate synopsis
bebb5d6d6b add: support the --pathspec-from-file option
21bb3083c3 cmd_add: prepare for next patch
4778452597 Merge branch 'prevent-name-squatting-on-windows'
a7b1ad3b05 Merge branch 'jk/fast-import-unsafe'
525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()`
e1d911dd4c mingw: disallow backslash characters in tree objects' file names
0060fd1511 clone --recurse-submodules: prevent name squatting on Windows
a52ed76142 fast-import: disallow "feature import-marks" by default
68061e3470 fast-import: disallow "feature export-marks" by default
019683025f fast-import: delay creating leading directories for export-marks
e075dba372 fast-import: stop creating leading directories for import-marks
11e934d56e fast-import: tighten parsing of boolean command line options
816f806786 t9300: create marks files for double-import-marks test
f94804c1f2 t9300: drop some useless uses of cat
4f3e57ef13 submodule--helper: advise on fatal alternate error
10c64a0b3c Doc: explain submodule.alternateErrorStrategy
ec48540fe8 packfile.c: speed up loading lots of packfiles
3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value
a4fb016ba1 pkt-line: fix a typo
0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r
e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data
228f53135a The second batch
6c630f237e Merge branch 'jk/gitweb-anti-xss'
3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell'
4775e02a5c Merge branch 'ma/t7004'
a6c6f8d02a Merge branch 'js/complete-svn-recursive'
3ae8defaf9 Merge branch 'jk/send-pack-remote-failure'
aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix'
4ab9616c76 Merge branch 'sg/skip-skipped-prereq'
723a8adba5 Merge branch 'ds/test-read-graph'
9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation'
406ca29e0d Merge branch 'rs/parse-options-dup-null-fix'
fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging'
8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion'
ef8f621045 Merge branch 'dl/complete-rebase-onto'
3c3e5d0ea2 Merge branch 'tg/stash-refresh-index'
43c5fe1c1d Merge branch 'nn/doc-rebase-merges'
6511cb33c9 Merge branch 'dd/sequencer-utf8'
f165457618 Merge branch 'jk/remove-sha1-to-hex'
a774064fb0 Merge branch 'dj/typofix-merge-strat'
ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates'
d2489ce92c Merge branch 'rs/skip-iprefix'
376e7309e1 Merge branch 'ln/userdiff-elixir'
9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log'
d3096d2ba6 Merge branch 'en/doc-typofix'
26f20fa3fc Merge branch 'ns/test-desc-typofix'
ffd130a363 Merge branch 'en/t6024-style'
5149902ff9 Merge branch 'en/misc-doc-fixes'
bcb06e204c Merge branch 'js/fetch-multi-lockfix'
d08daec001 Merge branch 'rs/trace2-dots'
fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix'
bad5ed39cd Merge branch 'cb/curl-use-xmalloc'
7ab2088255 Merge branch 'rt/fetch-message-fix'
f089ddd56a Merge branch 'es/myfirstcontrib-updates'
3c90710c0c Merge branch 'hw/config-doc-in-header'
d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code'
5444d52866 Merge branch 'js/vreportf-wo-buffering'
05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides'
532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default'
dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists'
fac9ab1419 Merge branch 'ma/bisect-doc-sample-update'
a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix'
0be5caf97c Merge branch 'jc/log-graph-simplify'
0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck'
2e697ced9d built-in add -i: offer the `quit` command
d7633578b5 built-in add -i: re-implement the `diff` command
8746e07277 built-in add -i: implement the `patch` command
ab1e1cccaf built-in add -i: re-implement `add-untracked` in C
c54ef5e424 built-in add -i: re-implement `revert` in C
a8c45be939 built-in add -i: implement the `update` command
f37c226454 built-in add -i: prepare for multi-selection commands
c08171d156 built-in add -i: allow filtering the modified files list
0c3944a628 add-interactive: make sure to release `rev.prune_data`
4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance
867fc7f310 grep: don't return an expression from pcre2_free()
c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables
72b006f4bf gpg-interface: prefer check_signature() for GPG verification
7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD
b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r
ccd469450a date.c: switch to reentrant {gm,local}time_r
271c351b2f t7811: don't create unused file
65efb42862 t9300: don't create unused file
f6b9413baf sequencer: fix a memory leak in sequencer_continue()
3eae30e464 doc: replace public-inbox links with lore.kernel.org
46c67492aa doc: recommend lore.kernel.org over public-inbox.org
5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects
17a4ae92ea t7700: s/test -f/test_path_is_file/
d2eee32a89 t7700: move keywords onto their own line
7a1c8c2346 t7700: remove spaces after redirect operators
09279086e8 t7700: drop redirections to /dev/null
756ee7fc9f t7501: stop losing return codes of git commands
38c1aa01de t7501: remove spaces after redirect operators
763b47bafa t5703: stop losing return codes of git commands
eacaa1c180 t5703: simplify one-time-sed generation logic
a29b2429e5 t5317: use ! grep to check for no matching lines
6c37f3ec1b t5317: stop losing return codes of git commands
b66e0a1773 t4138: stop losing return codes of git commands
afd43c9905 t4015: use test_write_lines()
946d2353a3 t4015: stop losing return codes of git commands
50cd31c652 t3600: comment on inducing SIGPIPE in `git rm`
3b737381d8 t3600: stop losing return codes of git commands
0d913dfa7e t3600: use test_line_count() where possible
29a40b5a67 t3301: stop losing return codes of git commands
9b5a9fa60a t0090: stop losing return codes of git commands
17aa9d9c1a t0014: remove git command upstream of pipe
77a946be98 apply-one-time-sed.sh: modernize style
176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job
ed254710ee test: use test_must_be_empty F instead of test_cmp empty F
c74b3cbb83 t7812: add missing redirects
213dabf49d test: use test_must_be_empty F instead of test -z $(cat F)
c93a5aaec8 t1400: use test_must_be_empty
6e4826ea75 t1410: use test_line_count
a5d04a3ef9 t1512: use test_line_count
54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd()
2059e79c0d name-rev: use skip_prefix() instead of starts_with()
1768aaf01d push: use skip_prefix() instead of starts_with()
ec6ee0c07a shell: use skip_prefix() instead of starts_with()
7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with()
a6293f5d28 fetch: use skip_prefix() instead of starts_with()
13ca8fb79e t5150: skip request-pull test if Perl is disabled
ecc0869080 commit-graph: use start_delayed_progress()
44a4693bfc progress: create GIT_PROGRESS_DELAY
528d9e6d01 t/perf: don't depend on Git.pm
b8dcc45387 perf-lib: use a single filename for all measurement types
fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
d82dfa7f5b rebase -i: finishing touches to --reset-author-date
1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory
393adf7a6f sequencer: directly call pick_commits() from complete_action()
a2dd67f105 rebase: fill `squash_onto' in get_replay_opts()
3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function
34065541e3 sequencer: update `done_nr' when skipping commands in a todo list
8638114e06 sequencer: update `total_nr' when adding an item to a todo list
0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk
ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk
ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
9917eca794 l10n: zh_TW: add translation for v2.24.0
0a8e3036a3 reset: parse rev as tree-ish in patch mode
f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits
8d483c8408 doc: document 'git submodule status --cached'
befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick
ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later
9a780a384d mingw: spawned processes need to inherit only standard handles
c5a03b1e29 mingw: work around incorrect standard handles
eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes
a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
2d05ef2778 sequencer: fix empty commit check when amending
ea8b7be147 git svn: stop using `rebase --preserve-merges`
67a6ea6300 gpg-interface: limit search for primary key fingerprint
392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern
cff4e9138d sparse-checkout: check for dirty status
416adc8711 sparse-checkout: update working directory in-process for 'init'
f75a69f880 sparse-checkout: cone mode should not interact with .gitignore
fb10ca5b54 sparse-checkout: write using lockfile
99dfa6f970 sparse-checkout: use in-process update for disable subcommand
e091228e17 sparse-checkout: update working directory in-process
e9de487aa3 sparse-checkout: sanitize for nested folders
4dcd4def3c unpack-trees: add progress to clear_ce_flags()
eb42feca97 unpack-trees: hash less in cone mode
af09ce24a9 sparse-checkout: init and set in cone mode
96cc8ab531 sparse-checkout: use hashmaps for cone patterns
879321eb0b sparse-checkout: add 'cone' mode
e6152e35ff trace2: add region in clear_ce_flags
72918c1ad9 sparse-checkout: create 'disable' subcommand
7bffca95ea sparse-checkout: add '--stdin' option to set subcommand
f6039a9423 sparse-checkout: 'set' subcommand
d89f09c828 clone: add --sparse mode
bab3c35908 sparse-checkout: create 'init' subcommand
94c0956b60 sparse-checkout: create builtin with 'list' subcommand
679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files
df6d3d6802 lib-bash.sh: move `then` onto its own line
2a02262078 t5520: replace `! git` with `test_must_fail git`
c245e58bb6 t5520: remove redundant lines in test cases
a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp
e959a18ee7 t5520: don't put git in upstream of pipe
5540ed27bc t5520: test single-line files by git with test_cmp
dd0f1e767b t5520: use test_cmp_rev where possible
979f8891cc t5520: replace test -{n,z} with test-lib functions
3037d3db90 t5520: use test_line_count where possible
93a9bf876b t5520: remove spaces after redirect operator
ceeef863de t5520: replace test -f with test-lib functions
4c8b046f82 t5520: let sed open its own input
53c62b9810 t5520: use sq for test case names
e8d1eaf9b4 t5520: improve test style
2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals
8cb7980382 t0000: test multiple local assignment
5b583e6a09 format-patch: pass notes configuration to range-diff
bd36191886 range-diff: pass through --notes to `git log`
9f726e1b87 range-diff: output `## Notes ##` header
3bdbdfb7a5 t3206: range-diff compares logs with commit notes
75c5aa0701 t3206: s/expected/expect/
79f3950d02 t3206: disable parameter substitution in heredoc
3a6e48e9f7 t3206: remove spaces after redirect operators
26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish
077a1fda82 userdiff: support Python async functions
3798149a74 SubmittingPatches: use `--pretty=reference`
1f0fc1db85 pretty: implement 'reference' format
618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type
0df621172d pretty: provide short date format
ac52d9410e t4205: cover `git log --reflog -z` blindspot
3e8ed3b93e pretty.c: inline initalize format_context
4982516451 revision: make get_revision_mark() return const pointer
f0f9de2bd7 completion: complete `tformat:` pretty format
fb2ffa77a6 SubmittingPatches: remove dq from commit reference
bae74c9dfb pretty-formats.txt: use generic terms for hash
bd00717eab SubmittingPatches: use generic terms for hash
9d45ac4cbf rev-list-options.txt: remove reference to --show-notes
828e829b9e argv-array: add space after `while`
e440fc5888 commit: support the --pathspec-from-file option
66a25a7242 doc: commit: synchronize <pathspec> description
64bac8df97 reset: support the `--pathspec-from-file` option
d137b50756 doc: reset: synchronize <pathspec> description
24e4750c96 pathspec: add new function to parse file
0dbc4a0edf ci(osx): update homebrew-cask repository with less noise
e02058a729 sequencer: handle rebase-merges for "onto" message
bae60ba7e9 builtin/unpack-objects.c: show throughput progress
2d92ab32fd rev-parse: make --show-toplevel without a worktree an error
9e5afdf997 fetch: add trace2 instrumentation
4c4066d95d run-command: move doc to run-command.h
6c51cb525d trace2: move doc to trace2.h
7db0305438 parse-options: add link to doc file in parse-options.h
d95a77d059 submodule-config: move doc to submodule-config.h
f3b9055624 credential: move doc to credential.h
bbcfa3002a tree-walk: move doc to tree-walk.h
971b1f24a2 argv-array: move doc to argv-array.h
f1ecbe0f53 trace: move doc to trace.h
13aa9c8b70 cache: move doc to cache.h
c0be43f898 sigchain: move doc to sigchain.h
19ef3ddd36 pathspec: move doc to pathspec.h
301d595e72 revision: move doc to revision.h
3a1b3415d9 attr: move doc to attr.h
126c1ccefb refs: move doc to refs.h
d27eb356bf remote: move doc to remote.h and refspec.h
405c6b1fbc sha1-array: move doc to sha1-array.h
d3d7172e40 merge: move doc to ll-merge.h
3f1480b745 graph: move doc to graph.h and graph.c
266f03eccd dir: move doc to dir.h
13c4d7eb22 diff: move doc to diff.h and diffcore.h
cd5522271f rebase -r: let `label` generate safer labels
867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()`
8c15904462 built-in add -i: implement the `help` command
3d965c7674 built-in add -i: use color in the main loop
68db1cbf8e built-in add -i: support `?` (prompt help)
76b743234c built-in add -i: show unique prefixes of the commands
6348bfba58 built-in add -i: implement the main loop
a376e37b2c gitweb: escape URLs generated by href()
b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI
f28bceca75 t/gitweb-lib.sh: drop confusing quotes
0eba60c9b7 t9502: pass along all arguments in xss helper
932757b0cc INSTALL: use existing shell scripts as example
b018719927 t7004: check existence of correct tag
1daaebcaa5 built-in add -i: color the header in the `status` command
5e82b9e4d2 built-in add -i: implement the `status` command
e4cb659ebd diff: export diffstat interface
f83dff60a7 Start to implement a built-in version of `git add --interactive`
df53c80822 stash: make sure we have a valid index before writing it
ad7a403268 send-pack: check remote ref status on pack-objects failure
d91ce887c9 t6120-describe: correct test repo history graph in comment
1f9247a3bd completion: tab-complete "git svn --recursive"
603960b50e promisor-remote: remove fetch_if_missing=0
e362fadcd0 clone: remove fetch_if_missing=0
169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL
51bd6be32d mingw: use COPY_ARRAY for copying array
4bd0593e0f test-tool: use 'read-graph' helper
e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway
d784d978f6 t4215: use helper function to check output
61eea521fe fsmonitor: do not compare bitmap size with size of split index
b19f3fe9dd hex: drop sha1_to_hex()
c1ce9c06d0 completion: learn to complete `git rebase --onto=`
f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls
d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase
aa6d7f93ed hex: drop sha1_to_hex_r()
52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch
5772b0c745 sequencer: reencode old merge-commit message
e0eba649e8 bundle-verify: add --quiet
79862b6b77 bundle-create: progress output control
73c3253d75 bundle: framework for options before bundle file
68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in"
b375744274 sequencer: reencode squashing commit's message
019a9d8362 sequencer: reencode revert/cherry-pick's todo list
0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list
e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding
1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary
d9f6f3b619 The first batch post 2.24 cycle
28014c1084 Merge branch 'bc/hash-independent-tests-part-6'
57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
c22f63c40f Merge branch 'pb/pretty-email-without-domain-part'
5731ca3657 Merge branch 'hw/remove-api-docs-placeholder'
14b58c62bc Merge branch 'sg/commit-graph-usage-fix'
eff313f8a7 Merge branch 'dl/apply-3way-diff3'
db806d7064 Merge branch 'sg/dir-trie-fixes'
f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix'
8f1119b988 Merge branch 'wb/midx-progress'
d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes'
0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges'
8f40d89783 Merge branch 'hv/bitshift-constants-in-blame'
d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head'
5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer'
b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc'
15d9f3dc66 Merge branch 'es/walken-tutorial'
026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'
ed28358833 convert: use skip_iprefix() in validate_encoding()
89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding()
03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules
ae821ffe83 multimail: fix a few simple spelling errors
557c5895c2 sha1dc: fix trivial comment spelling error
aa74be316a Fix spelling errors in test commands
96c0caf5e3 Fix spelling errors in messages shown to users
4dc8b1c114 Fix spelling errors in names of tests
7a40cf1553 Fix spelling errors in comments of testcases
15beaaa3d1 Fix spelling errors in code comments
a807200f67 userdiff: add Elixir to supported userdiff languages
461caf3e8a git-shortlog.txt: include commit limiting options
6462d5eb9a fetch: remove fetch_if_missing=0
46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion
99b2ba35f5 t0028: eliminate non-standard usage of printf
add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
14c4776d75 t: fix typo in test descriptions
270de6acbe t6024: modernize style
77363a51fb name-hash.c: remove duplicate word in comment
c92faa4d22 hashmap: fix documentation misuses of -> versus .
a6d39f2efb git-filter-branch.txt: correct argument name typo
4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators
8915297925 Fix spelling errors in documentation outside of Documentation/
031fd4b93b Documentation: fix a bunch of typos, both old and new
dd0b61f577 fsmonitor: fix watchman integration
5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare()
7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph
c14e6e7903 fetch: add the command-line option `--write-commit-graph`
da72936f54 Git 2.24
1d34d425d4 Merge branch 'bc/doc-use-docbook-5'
dac1d83c91 Merge branch 'ds/commit-graph-on-fetch'
c32ca691c2 Merge branch 'jt/delay-fetch-if-missing'
ab6b50e4c8 Merge https://github.com/prati0100/git-gui
93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2
fe28ad8520 rebase: add --reset-author-date
08187b4cba rebase -i: support --ignore-date
0185c683c9 sequencer: rename amend_author to author_to_rename
cbd8db17ac rebase -i: support --committer-date-is-author-date
c068bcc59b sequencer: allow callers of read_author_script() to ignore fields
ba51d2fb24 rebase -i: add --ignore-whitespace flag
3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower
3ada78de3f myfirstcontrib: add dependency installation step
4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt
4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly
8dfb04ae96 update-index: optionally leave skip-worktree entries alone
116d1fa6c6 vreportf(): avoid relying on stdio buffering
efd5444238 RelNotes/2.24.0: fix self-contradictory note
391c7e40b5 fetch.c: fix typo in a warning message
55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template
849e43680d RelNotes/2.24.0: typofix
0115e5d929 git-diff.txt: document return code of `--no-index`
798d66e35d l10n: de.po: Update German translation
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u)
f21f8f5d35 Git 2.24-rc2
8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix'
0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix'
f2db52c46b Merge branch 'js/mingw-needs-hiding-fix'
5b7594abdc Merge branch 'master' of github.com:vnwildman/git
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po
26b061007c submodule: teach set-url subcommand
460782b7be t7519-status-fsmonitor: improve comments
d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses
4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694)
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0
762d5b4f46 help: add gitsubmodules to the list of guides
76a53d640f git_path(): handle `.lock` files correctly
3ce47211a6 t1400: wrap setup code in test case
44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string
6c02042139 clone: rename static function `dir_exists()`.
8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command
77200e9332 l10n: es: 2.24.0 round 2
e42df36b42 Merge branch 'l10n/it/update-italian-translation'
5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2
51728480fe l10n: fr v2.24.0 rnd2
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new)
468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master
b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree()
c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit()
103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag()
f648ee7088 fsck: rename vague "oid" local variables
cc579000bf fsck: don't require an object struct in verify_headers()
7854399366 fsck: don't require an object struct for fsck_ident()
b8b00f1693 fsck: drop blob struct from fsck_finish()
6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob()
38370253fd fsck: don't require an object struct for report()
f59793763d fsck: only require an oid for skiplist functions
5afc4b1dc6 fsck: only provide oid/type in fsck_error callback
82ef89b318 fsck: don't require object structs for display functions
733902905d fsck: use oids rather than objects for object_name API
d40bbc109b fsck_describe_object(): build on our get_object_name() primitive
a59cfb3230 fsck: unify object-name code
23a173a761 fsck: require an actual buffer for non-blobs
2175a0c601 fsck: stop checking tag->tagged
ec65231571 fsck: stop checking commit->parent counts
1de6007d85 fsck: stop checking commit->tree value
228c78fbd4 commit, tag: don't set parsed bit for parse failures
60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()`
8b656572ca builtin/commit-graph.c: remove subcommand-less usage string
fa26d5ede6 t4048: abstract away SHA-1-specific constants
cf02be8486 t4045: make hash-size independent
38ee26b2a3 t4044: update test to work with SHA-256
37ab8ebef1 t4039: abstract away SHA-1-specific constants
0370b35414 t4038: abstract away SHA-1 specific constants
0253e126a2 t4034: abstract away SHA-1-specific constants
45e2ef2b1d t4027: make hash-size independent
79b0edc1a0 t4015: abstract away SHA-1-specific constants
840624ff55 t4011: abstract away SHA-1-specific constants
32a6707267 t4010: abstract away SHA-1-specific constants
440bf91dfa t3429: remove SHA1 annotation
0b408ca2bd t1305: avoid comparing extensions
2eabd38313 rev-parse: add a --show-object-format option
52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode
45e206f0d8 t4203: use test-lib.sh definitions
2ae4944aac t6006: use test-lib.sh definitions
cb99a34e23 commit-graph: fix writing first commit-graph during fetch
e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug
7b4fb434b4 documentation: remove empty doc files
566a1439f6 Git 2.24-rc1
04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix'
4d6fb2beeb Merge branch 'ds/feature-macros'
5f0b6ed907 Merge branch 'js/azure-ci-osx-fix'
c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs'
1b4f85285f Merge branch 'dl/submodule-set-branch'
c7aadccba0 fetch: delay fetch_if_missing=0 until after config
c11e9966cb repo-settings: read an int for index.version
091489d068 apply: respect merge.conflictStyle in --3way
aa76ae4905 t4108: demonstrate bug in apply
95806205cd t4108: use `test_config` instead of `git config`
b0069684d4 t4108: remove git command upstream of pipe
fa87b81385 t4108: replace create_file with test_write_lines
7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job
6c96630cb0 config: move documentation to config.h
d81542e6f3 Eleventh batch
e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix'
d45d771978 Merge branch 'bc/smart-http-atomic-push'
22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix'
2e215b7959 Merge branch 'sb/userdiff-dts'
e3cf08361a Merge branch 'sg/progress-fix'
b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix'
c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc'
f45f88b2e4 path.c: don't call the match function without value in trie_find()
c72fc40d09 path.c: clarify two field names in 'struct common_dir'
8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file
7cb8c929d7 path.c: clarify trie_find()'s in-code comment
e536b1fedf Documentation: mention more worktree-specific exceptions
680cba2c2b multi-pack-index: add [--[no-]progress] option.
64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack
ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file
8dc18f8937 midx: add progress to expire_midx_packs
840cef0c70 midx: add progress to write_midx_file
efbc3aee08 midx: add MIDX_PROGRESS flag
0eb3671ed9 ci(osx): use new location of the `perforce` cask
da1e295e00 t604[236]: do not run setup in separate tests
49b8133a9e merge-recursive: fix merging a subdirectory into the root directory
d3eebaad5e merge-recursive: clean up get_renamed_dir_portion()
80736d7c5e doc: am --show-current-patch gives an entire e-mail message
a8e2c0eadc t7419: change test_must_fail to ! for grep
19c29e538e t4014: make output-directory tests self-contained
12a4aeaad8 Merge branch 'js/azure-pipelines-msvc'
399c23c046 ci(visual-studio): actually run the tests in parallel
711cd6d15c ci(visual-studio): use strict compile flags, and optimization
370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master
13bcea8c7f l10n: fr 2.24.0 rnd 1
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed)
8da56a4848 userdiff: fix some corner cases in dts regex
86795774bb builtin/blame.c: constants into bit shift format
feebd2d256 rebase: hide --preserve-merges option
0e40a73a4c Doc: Bundle file usage
78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error
12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error
c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error
2b6f6ea1bd test-progress: fix test failures on big-endian systems
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693)
176f5adfdb completion: clarify installation instruction for zsh
d966095db0 Git 2.24-rc0
90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array'
3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth'
d0258d0944 Merge branch 'rs/http-push-simplify'
bb52def6da Merge branch 'jj/stash-reset-only-toplevel'
f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs'
e5fca6b573 Merge branch 'bb/compat-util-comment-fix'
43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup'
07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely'
2d74d28ee0 Merge branch 'dl/compat-cleanup'
9b83a94829 Merge branch 'ta/t1308-typofix'
376012c919 Merge branch 'js/doc-stash-save'
10da030ab7 grep: avoid leak of chartables in PCRE2
513f2b0bbd grep: make PCRE2 aware of custom allocator
57d4660468 grep: make PCRE1 aware of custom allocator
d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand
8af69cf3e2 t3301: test diagnose messages for too few/many paramters
6f1194246a remote-curl: pass on atomic capability to remote side
bbb13e8188 graph: fix coloring of octopus dashes
92beecc136 graph: flatten edges that fuse with their right neighbor
479db18bc0 graph: smooth appearance of collapsing edges on commit lines
0195285b95 graph: rename `new_mapping` to `old_mapping`
d62893ecc1 graph: commit and post-merge lines for left-skewed merges
0f0f389f12 graph: tidy up display of left-skewed merges
458152cce1 graph: example of graph output that can be simplified
ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state
46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()`
a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()`
9157a2a032 graph: reuse `find_new_column_by_commit()`
210179a20d graph: handle line padding in `graph_next_line()`
fbccf255f9 graph: automatically track display width of graph lines
5374a290aa fetch-pack: write fetched refs to .promisor
4627bc777e sequencer: run post-commit hook
49697cb721 move run_commit_hook() to libgit and use it there
12bb7a540a sequencer.h fix placement of #endif
6a619ca03c t3404: remove uneeded calls to set_fake_editor
b2dbacbddf t3404: set $EDITOR in subshell
88a92b6c73 t3404: remove unnecessary subshell
bf8e65b30b format-patch: teach --cover-from-description option
a92331df18 format-patch: use enum variables
46273df7bf format-patch: replace erroneous and condition
3b3c79f6c9 diff-highlight: fix a whitespace nit
108b97dc37 Ninth batch
cbe8cdd3a0 Merge branch 'jk/coc'
3b9ec27919 Merge branch 'js/trace2-fetch-push'
c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch'
1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup'
eb3de5b823 Merge branch 'js/xdiffi-comment-updates'
4e8371ec26 Merge branch 'dl/t0000-skip-test-test'
b6d712fa4e Merge branch 'tg/range-diff-output-update'
77458870a5 Merge branch 'gs/sq-quote-buf-pretty'
5efabc7ed9 Merge branch 'ew/hashmap'
d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files'
6ed610b968 Merge branch 'am/t0028-utf16-tests'
5b900fb812 Merge branch 'dl/octopus-graph-bug'
16d9d7184b Merge branch 'en/fast-imexport-nested-tags'
6d5291be45 Merge branch 'js/azure-pipelines-msvc'
ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd'
d96e31e390 Merge branch 'js/fetch-jobs'
280bd44551 Merge branch 'en/merge-recursive-cleanup'
062a309d36 remote-curl: use argv_array in parse_push()
a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes
5cc6a4be11 http-push: simplify deleting a list item
556895d0c8 stash: avoid recursive hard reset on submodules
b524f6b399 Merge branch 'ka/japanese-translation'
f6f3824b4e git-gui: improve Japanese translation
61f4b407d3 Merge branch 'py/readme'
1e6880fd06 git-gui: add a readme
edefc31873 format-patch: create leading components of output directory
68b69211b2 git-compat-util: fix documentation syntax
fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth()
e0479fa073 documentation: add tutorial for object walking
3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed
4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target
9cad1c4488 pthread.h: manually align parameter lists
8c1cfd58e3 t1308-config-set: fix a test that has a typo
57d8f4b4c7 doc(stash): clarify the description of `save`
08da6496b6 Eighth batch
07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup'
f0d407e6ae Merge branch 'kt/add-i-progress'
66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree'
a4c5d9f66e Merge branch 'rs/dedup-includes'
159cdabd87 Merge branch 'js/range-diff-noprefix'
93424f1f7d Merge branch 'cb/pcre1-cleanup'
a73f91774c Merge branch 'ab/pcre-jit-fixes'
4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword'
020011f2cb Merge branch 'tk/git-svn-trim-author-name'
676278f8ea Merge branch 'bc/object-id-part17'
aafb75452b Merge branch 'en/clean-nested-with-ignored'
3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails
5cdf2301d4 add a Code of Conduct document
70bf0b755a Seventh batch
9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat'
2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary'
d17f54947d Merge branch 'rs/convert-fix-utf-without-dash'
82c80f98e6 Merge branch 'py/git-gui-has-maintainer'
6e12570822 Merge branch 'ah/cleanups'
772cad0afb Merge branch 'js/diff-rename-force-stable-sort'
424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path'
678a9ca629 Merge branch 'as/shallow-slab-use-fix'
0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix'
042a54d251 Merge branch 'am/visual-studio-config-fix'
03d3b1297c xdiffi: fix typos and touch up comments
b05b40930e t0000: cover GIT_SKIP_TESTS blindspots
d8bc1a518a send-pack: never fetch when checking exclusions
756fb0dedb t4014: treat rev-list output as the expected value
2b6a9b13ca range-diff: don't segfault with mode-only changes
360c7ba330 transport: push codepath can take arbitrary repository
ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments
b657047719 merge-recursive: fix the fix to the diff3 common ancestor label
b744c3af07 Sixth batch
417056578a Merge branch 'bw/submodule-helper-usage-fix'
9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check'
1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a'
59b19bcd9f Merge branch 'cc/multi-promisor'
1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way'
5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort'
eb35c18e42 Merge branch 'sg/travis-help-debug'
cabb145fe3 Merge branch 'rs/alias-use-copy-array'
56c7ab0f4e Merge branch 'sg/t-helper-gitignore'
e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang'
583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules'
337e3f2b49 Merge branch 'rs/nth-switch-code-simplification'
8f53fe1733 Merge branch 'hb/hg-to-git-py3'
ef93bfbd45 Merge branch 'sg/progress-fix'
980351d1ac Merge branch 'js/doc-patch-text'
80693e3f09 Merge branch 'tb/commit-graph-harden'
ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge'
3f84633563 Merge branch 'dl/cocci-everywhere'
caf150ce7d Merge branch 'gs/commit-graph-progress'
1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim'
1398171378 Merge branch 'rs/commit-graph-use-list-count'
773521df26 Merge branch 'rs/nth-parent-parse'
7f17913161 Merge branch 'dl/submodule-set-branch'
cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix'
bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees'
098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack'
37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc'
e392382f95 Merge branch 'dl/complete-rebase-and-archive'
cda8faa37e Merge branch 'jk/commit-graph-cleanup'
36d2fca82b Merge branch 'ss/get-time-cleanup'
ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob'
ba2d451122 Merge branch 'tg/stash-refresh-index'
e2b5038d87 hashmap_entry: remove first member requirement from docs
404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry
23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators
c8e424c9c9 hashmap: introduce hashmap_free_entries
8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry *
87571c3f71 hashmap: use *_entry APIs for iteration
939af16eac hashmap_cmp_fn takes hashmap_entry params
f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *"
f0e63c4113 hashmap: use *_entry APIs to wrap container_of
6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *"
973d5eea74 introduce container_of macro
26b455f21e hashmap_put takes "struct hashmap_entry *"
28ee794128 hashmap_remove takes "const struct hashmap_entry *"
b6c5241606 hashmap_get takes "const struct hashmap_entry *"
b94e5c1df6 hashmap_add takes "struct hashmap_entry *"
f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *"
d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *"
d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry
12878c8351 coccicheck: detect hashmap_entry.hash assignment
e010a41216 diff: use hashmap_entry_init on moved_entry.ent
f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo"
de5abb5f7a git-p4: auto-delete named temporary file
c90b652afd Fifth batch
f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1'
b0f8aed48f Merge branch 'ma/user-manual-markup-update'
faf5576a8d Merge branch 'bc/doc-use-docbook-5'
314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes'
70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo'
847650798b Merge branch 'am/mailmap-andrey-mazo'
1a155f2e66 Merge branch 'jc/git-gui-has-maintainer'
1bcef51204 t/oid-info: add empty tree and empty blob values
ecde49bb8a t/oid-info: allow looking up hash algorithm name
11a3d3aadd git-rev-list.txt: prune options in synopsis
7d2f003ee4 Documentation: update the location of the git-gui repo
b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding()
46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines
b35304bf95 ci: really use shallow clones on Azure Pipelines
ab7d854aba tests: let --immediate and --write-junit-xml play well together
be5d88e112 test-tool run-command: learn to run (parts of) the testsuite
5d65ad17a9 vcxproj: include more generated files
030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built
61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable()
e4347c9434 msvc: handle DEVELOPER=1
ed712ef8d5 msvc: ignore some libraries when linking
5b8f9e2417 compat/win32/path-utils.h: add #include guards
41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning
c097b95a26 msvc: avoid using minus operator on unsigned types
dfd557c978 stash apply: report status correctly even in a worktree's subdirectory
d54dea77db fetch: let --jobs=<n> parallelize --multiple, too
87db61a436 trace2: write discard message to sentinel files
83e57b04e6 trace2: discard new traces if target directory has too many files
11c21f22de t4214: demonstrate octopus graph coloring failure
25eb905e14 t4214: explicitly list tags in log
63be8c8dd7 t4214: generate expect in their own test cases
a7a5590c6e t4214: use test_merge
94ba151300 test-lib: let test_merge() perform octopus merges
22541013d0 docs: clarify trace2 version invariants
3d4548e7e2 docs: mention trace2 target-dir mode in git-config
2fe44394c8 treewide: remove duplicate #include directives
dbcd970c27 push: do not pretend to return `int` from `die_push_simple()`
941790d7de fast-export: handle nested tags
8d7d33c1ce t9350: add tests for tags of things other than a commit
a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags
208d69246e fast-export: add support for --import-marks-if-exists
b8f50e5b60 fast-import: add support for new 'alias' command
f73b2aba05 fast-import: allow tags to be identified by mark labels
3164e6bd24 fast-import: fix handling of deleted tags
8085050ab4 add -i: show progress counter in the prompt
69fdb922ad Merge branch 'bw/diff3-conflict-style'
b436825b9b git-gui: support for diff3 conflict style
937b76ed49 range-diff: internally force `diff.noprefix=true`
411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job
25e4b8099c push: add trace2 instrumentation
5fc31180d8 fetch: add trace2 instrumentation
53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value
c3b57dc2a0 git-gui: use existing interface to query a path's attribute
45ab460d4a Merge branch 'js/git-bash-if-available'
0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command
71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only)
54a80a9ad8 wrapper: use a loop instead of repetitive statements
baed6bbb5b diffcore-break: use a goto instead of a redundant if statement
8da02ce62a commit-graph: remove a duplicate assignment
ddb3c856f3 shallow.c: don't free unallocated slabs
8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits
65904b8b2b promisor-remote: skip move_to_tail when no-op
2049b8dc65 diffcore_rename(): use a stable sort
97fff61012 Move git_sort(), a stable sort, into into libgit.a
69f272b922 dir: special case check for the possibility that pathspec is NULL
6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available
bc12974a89 Fourth batch
5a5350940b Merge branch 'ds/commit-graph-on-fetch'
974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch'
9755f70fe6 Merge branch 'ds/include-exclude'
93fc8760e7 Merge branch 'jh/trace2-pretty-output'
640f9cd599 Merge branch 'dl/rebase-i-keep-base'
026428c35e Merge branch 'sg/clean-nested-repo-with-ignored'
21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip'
d693345518 Merge branch 'dl/use-sq-from-test-lib'
d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes'
2be6ccc01a Merge branch 'sg/git-test-boolean'
cf861cd7a0 Merge branch 'rs/get-tagged-oid'
91243b019d Merge branch 'en/filter-branch-deprecation'
9bc67b6658 Merge branch 'en/merge-options-ff-and-friends'
fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden'
cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option'
8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return'
3ff6af7753 Merge branch 'nd/switch-and-restore'
aadac067aa Merge branch 'tb/file-url-to-unc-path'
b57a88a5f1 Merge branch 'js/gitdir-at-unc-root'
6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path'
430439536b Merge branch 'rs/parse-tree-indirect'
991fd97b9a Merge branch 'jk/fast-import-history-bugfix'
74a39b9bcc Merge branch 'mh/notes-duplicate-entries'
37801f0665 Merge branch 'tb/banned-vsprintf-namefix'
21ce0b48f3 Merge branch 'mh/release-commit-memory-fix'
f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup'
bf6136cab8 Merge branch 'rs/strbuf-detach'
a2e22bb3ad Merge branch 'rs/trace2-dst-warning'
1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup'
0281733483 Merge branch 'bc/hash-independent-tests-part-5'
f06fb376ed Merge branch 'jc/test-cleanup'
00bb74453d Merge branch 'dl/compat-cleanup'
59438be06c Merge branch 'js/visual-studio'
cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone'
af2abd870b fast-export: fix exporting a tag and nothing else
c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor
dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit
fd5b820d9c user-manual.txt: change header notation
e79b34533a user-manual.txt: add missing section label
b503a2d515 Makefile: emulate compile in $(HCO) target better
af26e2a9d2 pack-bitmap.h: remove magic number
b06fdead04 promisor-remote.h: include missing header
97b989ee3a apply.h: include missing header
4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name
d928a8388a t0028: add more tests
0b63fd6965 t0028: fix test for UTF-16-LE-BOM
fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration
2e09c01232 name-rev: avoid cutoff timestamp underflow
8464f94aeb promisor-remote.h: drop extern from function declaration
75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp
24c681794f doc: MyFirstContribution: fix cmd placement instructions
c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode
60c60b627e Merge branch 'py/git-git-extra-stuff'
faf420e05a treewide: correct several "up-to-date" to "up to date"
b71c6c3b64 Fix build with core.autocrlf=true
16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
26e3d1cbea .mailmap: update email address of Andrey Mazo
27ea41c0b4 t/helper: ignore only executable files
7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
83e3ad3b12 merge-recursive: symlink's descendants not in way
34933d0eff stash: make sure to write refreshed cache
e080b34540 merge: use refresh_and_write_cache
22184497a3 factor out refresh_and_write_cache function
7371612255 commit-graph: add --[no-]progress to write and verify
47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW
253bfe49bd SubmittingPatches: git-gui has a new maintainer
d17ae00c97 hg-to-git: make it compatible with both python3 and python2
4c86140027 Third batch
f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http'
627b826834 Merge branch 'md/list-objects-filter-combo'
b9ac6c59b8 Merge branch 'cc/multi-promisor'
de67293e74 Merge branch 'sg/line-log-tree-diff-optim'
95486229e3 Merge branch 'sg/complete-configuration-variables'
f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook'
a2e524ecf3 Merge branch 'cb/curl-use-xmalloc'
128666753b Merge branch 'jk/drop-release-pack-memory'
917a319ea5 Merge branch 'js/rebase-r-strategy'
7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui
4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
0d4304c124 doc: fix reference to --ignore-submodules
af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py
8a3a6817e2 Merge gitk to pick up emergency build fix
2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po
9027af58e2 Makefile: run coccicheck on more source files
43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
5dedf7de53 Makefile: define THIRD_PARTY_SOURCES
902b90cf42 clean: fix theoretical path corruption
ca8b5390db clean: rewrap overly long line
09487f2cba clean: avoid removing untracked files in a nested git repository
e86bbcf987 clean: disambiguate the definition of -d
3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run
29b577b960 dir: add commentary explaining match_pathspec_item's return value
89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it
a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
404ebceda0 dir: also check directories for matching pathspecs
a5e916c745 dir: fix off-by-one error in match_pathspec_item
bbbb6b0b89 dir: fix typo in comment
7541cc5302 t7300: add testcases showing failure to clean specified pathspecs
0eb7c37a8a diff, log doc: small grammer, format, and language fixes
6fae6bd518 diff, log doc: say "patch text" instead of "patches"
2bb74b53a4 Test the progress display
bbf47568ad Revert "progress: use term_clear_line()"
cf6a2d2557 Makefile: strip leading ./ in $(LIB_H)
b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup
689a146c91 commit-graph: use commit_list_count()
59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N"
a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base"
cf34337f98 list-objects-filter: give a more specific error sparse parsing error
4c96a77594 list-objects-filter: delay parsing of sparse oid
72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter
83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer
7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>`
226daba280 Doc/Makefile: give mansource/-version/-manual attributes
40e747e89d git-submodule.txt: fix AsciiDoc formatting error
f6461b82b9 Documentation: fix build with Asciidoctor 2
3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
f7a8834ba4 Merge branch 'bp/amend-toggle-bind'
ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit"
9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes
d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog
beffae768a gitk: Add Chinese (zh_CN) translation
56d9cbe68b packfile: expose get_delta_base()
bab28d9f97 builtin/pack-objects: report reused packfile objects
6c8ec8c30a Merge branch 'bw/commit-scrollbuffer'
acfa495519 Merge branch 'bw/amend-checkbutton'
da08d559b7 git-gui: add horizontal scrollbar to commit buffer
ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton
aeeb978ba6 completion: teach archive to use __gitcomp_builtin
2b9bd488ae completion: teach rebase to use __gitcomp_builtin
d49dffde9a completion: add missing completions for log, diff, show
6abada1880 upload-pack: disable commit graph more gently for shallow traversal
fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time
72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set
4fd39c76e6 doc: minor formatting fix
29f4332e66 Quit passing 'now' to date code
c77abf0460 Merge branch 'py/revert-hunks-lines'
5a2bb62180 Merge branch 'bp/widget-focus-hotkeys'
e07446ed5f git-gui: add hotkeys to set widget focus
f981ec18cf cache-tree: do not lazy-fetch tentative tree
f1d4a28250 Second batch
c8ada15456 Merge branch 'bc/reread-attributes-during-rebase'
8f3ba423e7 Merge branch 'tg/t0021-racefix'
a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email'
d49c2c3466 Merge branch 'sb/userdiff-dts'
2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe'
4c49dd042d Merge branch 'nd/diff-parseopt'
d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix'
8ce8a63b46 Merge branch 'ds/midx-expire-repack'
9437394661 Merge branch 'cb/fetch-set-upstream'
af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix'
fa9e7934c7 Merge branch 'bm/repository-layout-typofix'
d1a251a1fa Merge branch 'en/checkout-mismerge-fix'
e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental'
f4f8dfe127 Merge branch 'ds/feature-macros'
4a12f89865 Merge branch 'jk/eoo'
b4a1eec332 Merge branch 'jk/repo-init-cleanup'
70336bd50a Merge branch 'py/git-gui-do-quit'
ad7c543e3b grep: skip UTF8 checks explicitly
0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration()
b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration
4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
b7e1ba5649 git-merge-index.txt: wrap shell listing in "----"
38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----"
5371813768 git-ls-remote.txt: wrap shell listing in "----"
1925fe0c8a Documentation: wrap config listings in "----"
922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor
2017956a19 Documentation: wrap blocks with "--"
dd2e50a84e commit-graph: turn off save_commit_buffer
67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits
806278dead commit-graph.c: handle corrupt/missing trees
16749b8dd2 commit-graph.c: handle commit parsing errors
23424ea759 t/t5318: introduce failing 'git commit-graph write' tests
bf1e28e0ad builtin/rebase.c: Remove pointless message
d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing
bd482d6e33 t: use common $SQ variable
3a37876b5d pack-objects: drop packlist index_pos optimization
7e6b96c73b test-read-cache: drop namelen variable
e4b369069e diff-delta: set size out-parameter to 0 for NULL delta
7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint
f1cbd033e2 pack-objects: use object_id in packlist_alloc()
0dfed92dfd git-am: handle missing "author" when parsing commit
3960290675 ci: restore running httpd tests
6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
c77722b3ea use get_tagged_oid()
dad3f0607b tag: factor out get_tagged_oid()
468ce99b77 unpack-trees: rename 'is_excluded_from_list()'
65edd96aec treewide: rename 'exclude' methods to 'pattern'
4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list'
ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern'
483e861111 t9902: use a non-deprecated command for testing
9df53c5de6 Recommend git-filter-repo instead of git-filter-branch
7b6ad97939 t6006: simplify, fix, and optimize empty message test
50094ca45f config/format.txt: specify default value of format.coverLetter
c1a6f21cd4 Doc: add more detail for git-format-patch
854b5cb46a t4014: stop losing return codes of git commands
dd2b6b6860 t4014: remove confusing pipe in check_threading()
6bd26f58ea t4014: use test_line_count() where possible
c6ec6dadba t4014: let sed open its own files
f2e2fa8f60 t4014: drop redirections to /dev/null
460609cbd5 t4014: use indentable here-docs
92014b69bb t4014: remove spaces after redirect operators
0ab74e979c t4014: use sq for test case names
cb46c40662 t4014: move closing sq onto its own line
b562a54c01 t4014: s/expected/expect/
e770fbfeff t3005: remove unused variable
da280f5f1a t: use LF variable defined in the test harness
7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch
552fc5016f mingw: apply array.cocci rule
476998d05b t3427: accelerate this test by using fast-export and fast-import
aac6ff7b5b .gitignore: stop ignoring `.manifest` files
2c65d90f75 am: reload .gitattributes after patching it
1577dc0f7c tree: simplify parse_tree_indirect()
50f26bd035 fetch: add fetch.writeCommitGraph config setting
8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set
27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options
0a8bc7068f clarify documentation for remote helpers
80e3658647 help: make help_unknown_ref() NORETURN
313677627a checkout: add simple check for 'git checkout -b'
3441de5b9c gitk: Make web links clickable
a4fa2f0a4c git-gui: allow undoing last revert
414d924beb rebase: teach rebase --keep-base
6330209d7d rebase tests: test linear branch topology
4effc5bc96 rebase: fast-forward --fork-point in more cases
c0efb4c1dd rebase: fast-forward --onto in more cases
2b318aa6c3 rebase: refactor can_fast_forward into goto tower
c9efc21683 t3432: test for --no-ff's interaction with fast-forward
1ebec8dfc1 fast-import: duplicate into history rather than passing ownership
9756082b3c fast-import: duplicate parsed encoding string
86ae43da6a status: mention --skip for revert and cherry-pick
b1b16bba96 completion: add --skip for cherry-pick and revert
deaa65a754 completion: merge options for cherry-pick and revert
4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
793ac7e309 t3432: test rebase fast-forward behavior
359ecebc34 t3431: add rebase --fork-point tests
502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage
ff61681b46 grep: refactor and simplify PCRE1 support
8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning()
fd99c2dd9b grep: use return value of strbuf_detach()
82f51af345 log-tree: always use return value of strbuf_detach()
7e92756751 http: don't leak urlmatch_config.vars
9784f97321 commit: free the right buffer in release_commit_memory
ce17feb1b3 path: add a function to check for path suffix
60d198d022 banned.h: fix vsprintf()'s ban message
60fe477a0b notes: avoid potential use-after-free during insertion
779ad6641b notes: avoid leaking duplicate entries
4e1a641ee3 mingw: fix launching of externals from Unicode paths
5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly
e2683d51d9 Fix .git/ discovery at the root of UNC shares
d17f2124a7 setup_git_directory(): handle UNC paths correctly
ebb8d2c90f mingw: support UNC in git clone file://server/share/repo
0c37c41d13 t4009: make hash size independent
c1f3dfcc23 t4002: make hash independent
8cc5ff83c3 t4000: make hash size independent
c784815073 t3903: abstract away SHA-1-specific constants
2ccdfb1c78 git-gui: return early when patch fails to apply
62bd99934b git-gui: allow reverting selected hunk
5f0a516de9 git-gui: allow reverting selected lines
fddf2ebe38 transport: teach all vtables to allow fetch first
ac3fda82bf transport-helper: skip ls-refs if unnecessary
745f681289 First batch after Git 2.23
d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg'
22e86e85cb Merge branch 'en/fast-import-merge-doc'
9c7573581c Merge branch 'jk/perf-no-dups'
4336fdb2ef Merge branch 'rs/nedalloc-fixlets'
8ae7a46c4d Merge branch 'sg/show-failed-test-names'
6ba06b582b Merge branch 'sg/commit-graph-validate'
072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix'
207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix'
77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests'
1b01cdbf2e Merge branch 'jk/tree-walk-overflow'
8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix'
307179732d Merge branch 'mt/grep-submodules-working-tree'
58166c2e9d t0021: make sure clean filter runs
8b3f33ef11 ref-filter: initialize empty name or email fields
3c81760bc6 userdiff: add a builtin pattern for dts files
fe49814409 t4014: drop unnecessary blank lines from test cases
a2bb801f6a line-log: avoid unnecessary full tree diffs
eef5204190 line-log: extract pathspec parsing from line ranges into a helper function
a63694f523 diff: skip GITLINK when lazy fetching missing objs
7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe
19800bdc3f parseopt: move definition of enum parse_opt_result up
415b770b88 packfile.h: drop extern from function declaration
acb49d1cc8 t3800: make hash-size independent
ca6ba94200 t3600: make hash size independent
19ce5496c2 t3506: make hash independent
9a6738c061 t3430: avoid hard-coded object IDs
4dd1b5f90f t3404: abstract away SHA-1-specific constants
b99bfc7a6c t3306: abstract away SHA-1-specific constants
e3e9d02e35 t3305: make hash size independent
b408cf8cf6 t3301: abstract away SHA-1-specific constants
b561edd213 t3206: abstract away hash size constants
a5f61c7d13 t3201: abstract away SHA-1-specific constants
1c24a54ea4 repository-layout.txt: correct pluralization of 'object'
b0a3186140 sequencer: simplify root commit creation
a47ba3c777 rebase -i: check for updated todo after squash and reword
450efe2d53 rebase -i: always update HEAD before rewording
c581e4a749 grep: under --debug, show whether PCRE JIT is enabled
aaa95dfa05 midx: switch to using the_hash_algo
be8e172e9f builtin/show-index: replace sha1_to_hex
3f34d70d40 rerere: replace sha1_to_hex
fc06be3b7f builtin/receive-pack: replace sha1_to_hex
69fa337060 builtin/index-pack: replace sha1_to_hex
3a4d7aa5ae packfile: replace sha1_to_hex
e0cb7cdb89 wt-status: convert struct wt_status to object_id
8d4d86b0f0 cache: remove null_sha1
f6ca67d673 builtin/worktree: switch null_sha1 to null_oid
dd336a5511 builtin/repack: write object IDs of the proper length
894c0f66bb pack-write: use hash_to_hex when writing checksums
4439c7a360 sequencer: convert to use the_hash_algo
95518faac1 bisect: switch to using the_hash_algo
e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo
fe9fec45f6 config: use the_hash_algo in abbrev comparison
976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
703d2d4193 bundle: switch to use the_hash_algo
9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo
7962e046ff show-index: switch hard-coded constants to the_hash_algo
fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ
7e0d029f18 builtin/rev-parse: switch to use the_hash_algo
319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo
f6af19a9ad fetch-pack: use parse_oid_hex
36261e42ec patch-id: convert to use the_hash_algo
28ba1830d0 builtin/replace: make hash size independent
24bc1a1292 pull, fetch: add --set-upstream option
71d41ff651 archive-tar: turn length miscalculation warning into BUG
17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header()
82a46af13e archive-tar: fix pax extended header length calculation
4060c1990a archive-tar: report wrong pax extended header length
4615a8cb5b merge-recursive: alphabetize include list
45ef16f77a merge-recursive: add sanity checks for relevant merge_options
f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
5bf7e5779e merge-recursive: split internal fields into a separate struct
e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output
a779fb829b merge-recursive: comment and reorder the merge_options fields
8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options
7c0a6c8e47 merge-recursive: move some definitions around to clean up the header
c749ab1da8 merge-recursive: rename merge_options argument to opt in header
bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity
ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list
4d7101e25c merge-recursive: fix some overly long lines
724dd767b2 cache-tree: share code between functions writing an index as a tree
345480d1ed merge-recursive: don't force external callers to do our logging
b4db8a2b76 merge-recursive: remove useless parameter in merge_trees()
98a1d3d888 merge-recursive: exit early if index != head
9822175d2b Ensure index matches head before invoking merge machinery, round N
10f751c06b merge-recursive: remove another implicit dependency on the_repository
f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks
8e01251694 merge-recursive: introduce an enum for detect_directory_renames values
743474cbfa merge-recursive: provide a better label for diff3 common ancestor
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u)
5bace62582 l10n: Update Catalan translation
139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
65c01c6442 checkout: provide better conflict hunk description with detached HEAD
d8523ca1b9 merge-recursive: be consistent with assert
acb7da05ac checkout: remove duplicate code
93b980e58f http: use xmalloc with cURL
64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental
aaf633c2ad repo-settings: create feature.experimental setting
c6cc4c5afd repo-settings: create feature.manyFiles setting
ad0fb65999 repo-settings: parse core.untrackedCache
31b1de6a09 commit-graph: turn on commit-graph by default
b068d9a250 t6501: use 'git gc' in quiet mode
7211b9e753 repo-settings: consolidate some config settings
507e5470a0 worktree remove: clarify error message on dirty worktree
5af9d5f6c8 completion: complete config variables and values for 'git clone --config='
88cd790d6a completion: complete config variables names and values for 'git clone -c'
dd33472831 completion: complete values of configuration variables after 'git -c var='
e1e00089da completion: complete configuration sections and variable names for 'git -c'
42d0efec59 completion: split _git_config()
d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp()
2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names
d9438873c4 completion: deduplicate configuration sections
7a09a8f093 completion: add tests for 'git config' completion
840d7e5b3c completion: complete more values of more 'color.*' configuration variables
08a12175d8 completion: fix a typo in a comment
9827d4c185 packfile: drop release_pack_memory()
d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed
362f8b280c t/perf: rename duplicate-numbered test script
742ed63345 trace2: cleanup whitespace in perf format
e34430556c trace2: cleanup whitespace in normal format
c2b890aca5 quote: add sq_append_quote_argv_pretty()
ad43e37839 trace2: trim trailing whitespace in normal format error message
04f10d332f trace2: remove dead code in maybe_add_string_va()
da4589ce7e trace2: trim whitespace in region messages in perf target format
0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
5440eb0ea2 git-gui: call do_quit before destroying the main window
bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook
6098817fd7 git-merge: honor pre-merge-commit hook
a1f3dd7eb3 merge: do no-verify like commit
f78f6c7e0c t7503: verify proper hook execution
70597e8386 nedmalloc: avoid compiler warning about unused value
c9b9c09dae nedmalloc: do assignments only after the declaration section
22932d9169 config: stop checking whether the_repository is NULL
5732f2b1ef common-main: delay trace2 initialization
58ebccb478 t1309: use short branch name in includeIf.onbranch test
67feca3b1c gitcli: document --end-of-options
51b4594b40 parse-options: allow --end-of-options as a synonym for "--"
19e8789b23 revision: allow --end-of-options to end option parsing
ffe1afe67c tests: show the test name and number at the start of verbose output
96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests
7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits'
39d8831856 commit-graph: turn a group of write-related macro flags into an enum
9916073be5 t5318-commit-graph: use 'test_expect_code'
620c09e1b6 restore: add test for deleted ita files
ecd72042de checkout.c: unstage empty deleted ita files
a613d4f817 pack-refs: always refresh after taking the lock file
decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
371df1bea9 trace2: cleanup column alignment in perf target format
5aa02f9868 tree-walk: harden make_traverse_path() length computations
c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path()
b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len()
37806080d7 tree-walk: use size_t consistently
7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
9055384710 tree-walk: drop oid from traverse_info
947208b725 setup_traverse_info(): stop copying oid
e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
a63f990d92 t3418: test `rebase -r` with merge strategies
5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges`
e145d99347 rebase -r: support merge strategies other than `recursive`
4e6023b13a t3427: fix another incorrect assumption
f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced
a9c71073da t3427: fix erroneous assumption
b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three
d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case
c248d32cdb t3427: simplify the `setup` test case significantly
8c1e24048a t3427: add a clarifying comment
5efed0ecf9 rebase: fold git-rebase--common into the -p backend
68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone
2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive`
6180b20239 t3400: stop referring to the scripted rebase
d5b581f228 Drop unused git-rebase--am.sh
814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation
6a289d45c0 grep: fix worktree case in submodules
870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching
8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data
09872f6418 grep: create a "is_fixed" member in "grep_pat"
8a35b540a9 grep: consistently use "p->fixed" in compile_regexp()
685668faaa grep: stop using a custom JIT stack with PCRE v1
34489239d0 grep: stop "using" a custom JIT stack with PCRE v2
04bef50c01 grep: remove overly paranoid BUG(...) code
b65abcafc7 grep: use PCRE v2 for optimized fixed-string search
48de2a768c grep: remove the kwset optimization
45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern>
25754125ce grep: make the behavior for NUL-byte in patterns sane
d316af059d grep tests: move binary pattern tests into their own file
471dac5d2c grep tests: move "grep binary" alongside the rest
f463beb805 grep: inline the return value of a function call used only once
b14cf112e2 t4210: skip more command-line encoding tests on MinGW
44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
4e2443b181 log tests: test regex backends in "--encode=<enc>" tests
90d21f9ebf list-objects-filter-options: make parser void
5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW
489fc9ee71 list-objects-filter-options: allow mult. --filter
c2694952e3 strbuf: give URL-encoding API a char predicate fn
cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list
f56f764279 list-objects-filter-options: move error check up
e987df5fe6 list-objects-filter: implement composite filters
842b00516a list-objects-filter-options: always supply *errbuf
7a7c7f4a6d list-objects-filter: put omits set in filter struct
9430147ca0 list-objects-filter: encapsulate filter components
4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c
60b7a92d84 Move repository_format_partial_clone to promisor-remote.c
db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
75de085211 remote: add promisor and partial clone config to the doc
7e154badc0 partial-clone: add multiple remotes in the doc
9a4c507886 t0410: test fetching from many promisor remotes
5e46139376 builtin/fetch: remove unique promisor remote limitation
fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter
b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote()
faf2abf496 promisor-remote: use repository_format_partial_clone
9cfebc1f3b promisor-remote: add promisor_remote_reinit()
9e27beaa23 promisor-remote: implement promisor_remote_get_direct()
48de315817 Add initial support for many promisor remotes
2e860675b6 fetch-object: make functions return an error code
c59c7c879e t0410: remove pipes after git commands

git-subtree-dir: third_party/git
git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 17:46:45 +01:00

22932 lines
462 KiB
Text

# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2020-03-11 15:26+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr ""
#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
#: builtin/rebase.c:2086 builtin/rebase.c:2130
msgid "could not read index"
msgstr ""
#: add-interactive.c:576 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr ""
#: add-interactive.c:634 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr ""
#: add-interactive.c:635 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr ""
#: add-interactive.c:672 git-add--interactive.perl:643
msgid "Update"
msgstr ""
#: add-interactive.c:689 add-interactive.c:877
#, c-format
msgid "could not stage '%s'"
msgstr ""
#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
#: builtin/rebase.c:899
msgid "could not write index"
msgstr ""
#: add-interactive.c:698 git-add--interactive.perl:628
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
#: add-interactive.c:716 git-add--interactive.perl:678
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
#: builtin/reset.c:144
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
#: add-interactive.c:751 git-add--interactive.perl:655
msgid "Revert"
msgstr ""
#: add-interactive.c:767
msgid "Could not parse HEAD^{tree}"
msgstr ""
#: add-interactive.c:805 git-add--interactive.perl:631
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
#: add-interactive.c:856 git-add--interactive.perl:695
#, c-format
msgid "No untracked files.\n"
msgstr ""
#: add-interactive.c:860 git-add--interactive.perl:689
msgid "Add untracked"
msgstr ""
#: add-interactive.c:887 git-add--interactive.perl:625
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
#: add-interactive.c:917
#, c-format
msgid "ignoring unmerged: %s"
msgstr ""
#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
#, c-format
msgid "No changes.\n"
msgstr ""
#: add-interactive.c:935 git-add--interactive.perl:1376
msgid "Patch update"
msgstr ""
#: add-interactive.c:974 git-add--interactive.perl:1754
msgid "Review diff"
msgstr ""
#: add-interactive.c:1002
msgid "show paths with changes"
msgstr ""
#: add-interactive.c:1004
msgid "add working tree state to the staged set of changes"
msgstr ""
#: add-interactive.c:1006
msgid "revert staged set of changes back to the HEAD version"
msgstr ""
#: add-interactive.c:1008
msgid "pick hunks and update selectively"
msgstr ""
#: add-interactive.c:1010
msgid "view diff between HEAD and index"
msgstr ""
#: add-interactive.c:1012
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
#: add-interactive.c:1020 add-interactive.c:1069
msgid "Prompt help:"
msgstr ""
#: add-interactive.c:1022
msgid "select a single item"
msgstr ""
#: add-interactive.c:1024
msgid "select a range of items"
msgstr ""
#: add-interactive.c:1026
msgid "select multiple ranges"
msgstr ""
#: add-interactive.c:1028 add-interactive.c:1073
msgid "select item based on unique prefix"
msgstr ""
#: add-interactive.c:1030
msgid "unselect specified items"
msgstr ""
#: add-interactive.c:1032
msgid "choose all items"
msgstr ""
#: add-interactive.c:1034
msgid "(empty) finish selecting"
msgstr ""
#: add-interactive.c:1071
msgid "select a numbered item"
msgstr ""
#: add-interactive.c:1075
msgid "(empty) select nothing"
msgstr ""
#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr ""
#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
msgid "What now"
msgstr ""
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "staged"
msgstr ""
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "unstaged"
msgstr ""
#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
msgid "path"
msgstr ""
#: add-interactive.c:1143
msgid "could not refresh index"
msgstr ""
#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
#, c-format
msgid "Bye.\n"
msgstr ""
#: add-patch.c:33 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:34 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:35 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:37
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
#: add-patch.c:40
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"q - quit; do not stage this hunk or any of the remaining ones\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:54 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:55 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:56 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:58
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
#: add-patch.c:61
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"q - quit; do not stash this hunk or any of the remaining ones\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:77 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:78 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:79 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:81
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
#: add-patch.c:84
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"q - quit; do not unstage this hunk or any of the remaining ones\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:99 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:100 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:101 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:103 add-patch.c:168 add-patch.c:211
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
#: add-patch.c:106
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:121 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:122 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:123 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:125 add-patch.c:147 add-patch.c:190
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr ""
#: add-patch.c:128 add-patch.c:193
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:150
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: add-patch.c:171
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:214
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
#: add-patch.c:318
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr ""
#: add-patch.c:337 add-patch.c:341
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr ""
#: add-patch.c:395
msgid "could not parse diff"
msgstr ""
#: add-patch.c:414
msgid "could not parse colored diff"
msgstr ""
#: add-patch.c:428
#, c-format
msgid "failed to run '%s'"
msgstr ""
#: add-patch.c:587
msgid "mismatched output from interactive.diffFilter"
msgstr ""
#: add-patch.c:588
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr ""
#: add-patch.c:761
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
#: add-patch.c:776
#, c-format
msgid ""
"hunks do not overlap:\n"
"%.*s\n"
"\tdoes not end with:\n"
"%.*s"
msgstr ""
#: add-patch.c:1052 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
#: add-patch.c:1056
#, c-format
msgid ""
"---\n"
"To remove '%c' lines, make them ' ' lines (context).\n"
"To remove '%c' lines, delete them.\n"
"Lines starting with %c will be removed.\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
#: add-patch.c:1070 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
#: add-patch.c:1103
msgid "could not parse hunk header"
msgstr ""
#: add-patch.c:1148
msgid "'git apply --cached' failed"
msgstr ""
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#.
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#: add-patch.c:1218 git-add--interactive.perl:1239
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
#: add-patch.c:1261
msgid "The selected hunks do not apply to the index!"
msgstr ""
#: add-patch.c:1262 git-add--interactive.perl:1343
msgid "Apply them to the worktree anyway? "
msgstr ""
#: add-patch.c:1269 git-add--interactive.perl:1346
msgid "Nothing was applied.\n"
msgstr ""
#: add-patch.c:1326
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"k - leave this hunk undecided, see previous undecided hunk\n"
"K - leave this hunk undecided, see previous hunk\n"
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
#: add-patch.c:1447 add-patch.c:1457
msgid "No previous hunk"
msgstr ""
#: add-patch.c:1452 add-patch.c:1462
msgid "No next hunk"
msgstr ""
#: add-patch.c:1468
msgid "No other hunks to goto"
msgstr ""
#: add-patch.c:1479 git-add--interactive.perl:1577
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
#: add-patch.c:1480 git-add--interactive.perl:1579
msgid "go to which hunk? "
msgstr ""
#: add-patch.c:1491
#, c-format
msgid "Invalid number: '%s'"
msgstr ""
#: add-patch.c:1496
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] ""
msgstr[1] ""
#: add-patch.c:1505
msgid "No other hunks to search"
msgstr ""
#: add-patch.c:1511 git-add--interactive.perl:1623
msgid "search for regex? "
msgstr ""
#: add-patch.c:1526
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr ""
#: add-patch.c:1543
msgid "No hunk matches the given pattern"
msgstr ""
#: add-patch.c:1550
msgid "Sorry, cannot split this hunk"
msgstr ""
#: add-patch.c:1554
#, c-format
msgid "Split into %d hunks."
msgstr ""
#: add-patch.c:1558
msgid "Sorry, cannot edit this hunk"
msgstr ""
#: add-patch.c:1609
msgid "'git apply' failed"
msgstr ""
#: advice.c:115
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
#: advice.c:168
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
#: advice.c:170
msgid "Committing is not possible because you have unmerged files."
msgstr ""
#: advice.c:172
msgid "Merging is not possible because you have unmerged files."
msgstr ""
#: advice.c:174
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
#: advice.c:176
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
#: advice.c:178
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
#: advice.c:186
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
#: advice.c:194
msgid "Exiting because of an unresolved conflict."
msgstr ""
#: advice.c:199 builtin/merge.c:1335
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
#: advice.c:201
msgid "Please, commit your changes before merging."
msgstr ""
#: advice.c:202
msgid "Exiting because of unfinished merge."
msgstr ""
#: advice.c:208
#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
" git switch -c <new-branch-name>\n"
"\n"
"Or undo this operation with:\n"
"\n"
" git switch -\n"
"\n"
"Turn off this advice by setting config variable advice.detachedHead to "
"false\n"
"\n"
msgstr ""
#: alias.c:50
msgid "cmdline ends with \\"
msgstr ""
#: alias.c:51
msgid "unclosed quote"
msgstr ""
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr ""
#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr ""
#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
#: apply.c:151
msgid "--index outside a repository"
msgstr ""
#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
#: apply.c:1372
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
msgstr[1] ""
#: apply.c:1385
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
#: apply.c:1481
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
#: apply.c:1550
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
#: apply.c:1753
msgid "new file depends on old contents"
msgstr ""
#: apply.c:1755
msgid "deleted file still has contents"
msgstr ""
#: apply.c:1789
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
#: apply.c:1828
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr ""
#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr ""
#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr ""
#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
#, c-format
msgid "failed to read %s"
msgstr ""
#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
#: apply.c:3442 apply.c:3685
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
#: apply.c:3528 apply.c:3700
#, c-format
msgid "%s: does not exist in index"
msgstr ""
#: apply.c:3537 apply.c:3708
#, c-format
msgid "%s: does not match index"
msgstr ""
#: apply.c:3572
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
#: apply.c:3575
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
#: apply.c:3591 apply.c:3595
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
#: apply.c:3607
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
#: apply.c:3621
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
#: apply.c:3626
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
#: apply.c:3652
msgid "removal patch leaves file contents"
msgstr ""
#: apply.c:3725
#, c-format
msgid "%s: wrong type"
msgstr ""
#: apply.c:3727
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
#: read-cache.c:1325
#, c-format
msgid "invalid path '%s'"
msgstr ""
#: apply.c:3936
#, c-format
msgid "%s: already exists in index"
msgstr ""
#: apply.c:3939
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
#: apply.c:3959
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
#: apply.c:3964
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
#: apply.c:3984
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
#: apply.c:3988
#, c-format
msgid "%s: patch does not apply"
msgstr ""
#: apply.c:4003
#, c-format
msgid "Checking patch %s..."
msgstr ""
#: apply.c:4095
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
#: apply.c:4102
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
#: apply.c:4105
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
#: apply.c:4114
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
#: apply.c:4124
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
#: apply.c:4262
#, c-format
msgid "unable to remove %s from index"
msgstr ""
#: apply.c:4296
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
#: apply.c:4302
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
#: apply.c:4310
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
#: apply.c:4316 apply.c:4461
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
#: apply.c:4359
#, c-format
msgid "failed to write to '%s'"
msgstr ""
#: apply.c:4363
#, c-format
msgid "closing file '%s'"
msgstr ""
#: apply.c:4433
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
#: apply.c:4531
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
#: apply.c:4539
msgid "internal error"
msgstr ""
#: apply.c:4542
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
#: apply.c:4553
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
#, c-format
msgid "cannot open %s"
msgstr ""
#: apply.c:4575
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
#: apply.c:4579
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
#: apply.c:4698
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
#: apply.c:4706
msgid "unrecognized input"
msgstr ""
#: apply.c:4726
msgid "unable to read index file"
msgstr ""
#: apply.c:4883
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
#: apply.c:4910
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
#: apply.c:4916 apply.c:4931
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
#: apply.c:4924
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr ""
#: apply.c:4968
msgid "don't apply changes matching the given path"
msgstr ""
#: apply.c:4971
msgid "apply changes matching the given path"
msgstr ""
#: apply.c:4973 builtin/am.c:2260
msgid "num"
msgstr ""
#: apply.c:4974
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
#: apply.c:4977
msgid "ignore additions made by the patch"
msgstr ""
#: apply.c:4979
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
#: apply.c:4983
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
#: apply.c:4985
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
#: apply.c:4987
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
#: apply.c:4989
msgid "make sure the patch is applicable to the current index"
msgstr ""
#: apply.c:4991
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
#: apply.c:4993
msgid "apply a patch without touching the working tree"
msgstr ""
#: apply.c:4995
msgid "accept a patch that touches outside the working area"
msgstr ""
#: apply.c:4998
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
#: apply.c:5000
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
#: apply.c:5002
msgid "build a temporary index based on embedded index information"
msgstr ""
#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
#: apply.c:5007
msgid "ensure at least <n> lines of context match"
msgstr ""
#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
msgid "action"
msgstr ""
#: apply.c:5009
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
#: apply.c:5012 apply.c:5015
msgid "ignore changes in whitespace when finding context"
msgstr ""
#: apply.c:5018
msgid "apply the patch in reverse"
msgstr ""
#: apply.c:5020
msgid "don't expect at least one line of context"
msgstr ""
#: apply.c:5022
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
#: apply.c:5024
msgid "allow overlapping hunks"
msgstr ""
#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
#: apply.c:5027
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
#: apply.c:5030
msgid "do not trust the line counts in the hunk headers"
msgstr ""
#: apply.c:5032 builtin/am.c:2248
msgid "root"
msgstr ""
#: apply.c:5033
msgid "prepend <root> to all filenames"
msgstr ""
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:15
msgid "git archive --list"
msgstr ""
#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
#: archive.c:396
#, c-format
msgid "no such ref: %.*s"
msgstr ""
#: archive.c:401
#, c-format
msgid "not a valid object name: %s"
msgstr ""
#: archive.c:414
#, c-format
msgid "not a tree object: %s"
msgstr ""
#: archive.c:426
msgid "current working directory is untracked"
msgstr ""
#: archive.c:457
msgid "fmt"
msgstr ""
#: archive.c:457
msgid "archive format"
msgstr ""
#: archive.c:458 builtin/log.c:1653
msgid "prefix"
msgstr ""
#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr ""
#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
#: parse-options.h:190
msgid "file"
msgstr ""
#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ""
#: archive.c:464
msgid "report archived files on stderr"
msgstr ""
#: archive.c:465
msgid "store only"
msgstr ""
#: archive.c:466
msgid "compress faster"
msgstr ""
#: archive.c:474
msgid "compress better"
msgstr ""
#: archive.c:477
msgid "list supported archive formats"
msgstr ""
#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
msgid "repo"
msgstr ""
#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr ""
#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
#: archive.c:489
msgid "Unexpected option --remote"
msgstr ""
#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr ""
#: archive.c:493
msgid "Unexpected option --output"
msgstr ""
#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
#: archive-tar.c:125 archive-zip.c:351
#, c-format
msgid "cannot stream blob %s"
msgstr ""
#: archive-tar.c:266 archive-zip.c:369
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
#: archive-tar.c:293 archive-zip.c:359
#, c-format
msgid "cannot read %s"
msgstr ""
#: archive-tar.c:465
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
#: archive-tar.c:468
msgid "unable to redirect descriptor"
msgstr ""
#: archive-tar.c:475
#, c-format
msgid "'%s' filter reported error"
msgstr ""
#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr ""
#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
#, c-format
msgid "deflate error (%d)"
msgstr ""
#: archive-zip.c:615
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr ""
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
#: attr.c:369
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
#: attr.c:409
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
#: bisect.c:745
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
#: bisect.c:770
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
#: bisect.c:775
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
#: bisect.c:780
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
#: bisect.c:788
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
#: bisect.c:801
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"So we cannot be sure the first %s commit is between %s and %s.\n"
"We continue anyway."
msgstr ""
#: bisect.c:840
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
#: bisect.c:890
#, c-format
msgid "a %s revision is needed"
msgstr ""
#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr ""
#: bisect.c:966 builtin/merge.c:149
#, c-format
msgid "could not read file '%s'"
msgstr ""
#: bisect.c:997
msgid "reading bisect refs failed"
msgstr ""
#: bisect.c:1019
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
#: bisect.c:1028
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
#: bisect.c:1057
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
#: bisect.c:1063
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
#: blame.c:2700
msgid "--contents and --reverse do not blend well."
msgstr ""
#: blame.c:2714
msgid "cannot use --contents with final commit object name"
msgstr ""
#: blame.c:2735
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
#: blame.c:2762
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
#: blame.c:2773
#, c-format
msgid "no such path %s in %s"
msgstr ""
#: blame.c:2784
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
#: 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 ""
#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
#: 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 ""
#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
#: builtin/commit.c:815
#, c-format
msgid "could not open '%s'"
msgstr ""
#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
#: bundle.c:146
msgid "need a repository to verify a bundle"
msgstr ""
#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
#: bundle.c:204
msgid "The bundle records a complete history."
msgstr ""
#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
#: bundle.c:273
msgid "unable to dup bundle descriptor"
msgstr ""
#: bundle.c:280
msgid "Could not spawn pack-objects"
msgstr ""
#: bundle.c:291
msgid "pack-objects died"
msgstr ""
#: bundle.c:333
msgid "rev-list died"
msgstr ""
#: bundle.c:382
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
#: bundle.c:469
msgid "Refusing to create empty bundle."
msgstr ""
#: bundle.c:479
#, c-format
msgid "cannot create '%s'"
msgstr ""
#: bundle.c:504
msgid "index-pack died"
msgstr ""
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
#: commit.c:53
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
#: commit.c:193
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
"Please use \"git replace --convert-graft-file\"\n"
"to convert the grafts into replace refs.\n"
"\n"
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
#: commit.c:1153
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
#: commit.c:1157
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
#: commit.c:1160
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
#: commit.c:1163
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
#: commit.c:1417
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
#: commit-graph.c:122
msgid "commit-graph file is too small"
msgstr ""
#: commit-graph.c:189
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr ""
#: commit-graph.c:196
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr ""
#: commit-graph.c:203
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
#: commit-graph.c:226
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
#: commit-graph.c:237
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
#: commit-graph.c:280
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
#: commit-graph.c:343
msgid "commit-graph has no base graphs chunk"
msgstr ""
#: commit-graph.c:353
msgid "commit-graph chain does not match"
msgstr ""
#: commit-graph.c:401
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
#: commit-graph.c:425
msgid "unable to find all commit-graph files"
msgstr ""
#: commit-graph.c:558 commit-graph.c:618
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
#: commit-graph.c:579
#, c-format
msgid "could not find commit %s"
msgstr ""
#: commit-graph.c:852 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr ""
#: commit-graph.c:1011 builtin/pack-objects.c:2782
#, c-format
msgid "unable to get type of object %s"
msgstr ""
#: commit-graph.c:1043
msgid "Loading known commits in commit graph"
msgstr ""
#: commit-graph.c:1060
msgid "Expanding reachable commits in commit graph"
msgstr ""
#: commit-graph.c:1079
msgid "Clearing commit marks in commit graph"
msgstr ""
#: commit-graph.c:1098
msgid "Computing commit graph generation numbers"
msgstr ""
#: commit-graph.c:1173
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
#: commit-graph.c:1186
#, c-format
msgid "error adding pack %s"
msgstr ""
#: commit-graph.c:1190
#, c-format
msgid "error opening index for %s"
msgstr ""
#: commit-graph.c:1214
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] ""
msgstr[1] ""
#: commit-graph.c:1234
#, c-format
msgid "invalid commit object id: %s"
msgstr ""
#: commit-graph.c:1249
msgid "Finding commits for commit graph among packed objects"
msgstr ""
#: commit-graph.c:1264
msgid "Counting distinct commits in commit graph"
msgstr ""
#: commit-graph.c:1294
msgid "Finding extra edges in commit graph"
msgstr ""
#: commit-graph.c:1340
msgid "failed to write correct number of base graph ids"
msgstr ""
#: commit-graph.c:1373 midx.c:814
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
#, c-format
msgid "unable to create '%s'"
msgstr ""
#: commit-graph.c:1445
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
#: commit-graph.c:1486
msgid "unable to open commit-graph chain file"
msgstr ""
#: commit-graph.c:1498
msgid "failed to rename base commit-graph file"
msgstr ""
#: commit-graph.c:1518
msgid "failed to rename temporary commit-graph file"
msgstr ""
#: commit-graph.c:1631
msgid "Scanning merged commits"
msgstr ""
#: commit-graph.c:1642
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr ""
#: commit-graph.c:1665
msgid "Merging commit-graph"
msgstr ""
#: commit-graph.c:1844
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr ""
#: commit-graph.c:1855
msgid "too many commits to write graph"
msgstr ""
#: commit-graph.c:1944
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
#: commit-graph.c:1954
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
#: commit-graph.c:1964 commit-graph.c:1979
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
#: commit-graph.c:1971
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr ""
#: commit-graph.c:2003
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
#: commit-graph.c:2010
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
#: commit-graph.c:2020
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
#: commit-graph.c:2029
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
#: commit-graph.c:2042
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
#: commit-graph.c:2047
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
#: commit-graph.c:2051
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
#: commit-graph.c:2066
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
#: commit-graph.c:2072
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"from\n"
"\t%s\n"
"This might be due to circular includes."
msgstr ""
#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
#: config.c:151
msgid "relative config includes must come from files"
msgstr ""
#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
#: config.c:406 sequencer.c:2444
#, c-format
msgid "invalid key: %s"
msgstr ""
#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr ""
#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr ""
#: config.c:978
msgid "out of range"
msgstr ""
#: config.c:978
msgid "invalid unit"
msgstr ""
#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr ""
#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr ""
#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
#: config.c:1518 builtin/pack-objects.c:3541
#, c-format
msgid "bad pack compression level %d"
msgstr ""
#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr ""
#: config.c:1743
msgid "unable to parse command-line config"
msgstr ""
#: config.c:2097
msgid "unknown error occurred while reading the configuration files"
msgstr ""
#: config.c:2267
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
#: config.c:2312
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
#: config.c:2358
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
#: config.c:2360
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
#: config.c:2441
#, c-format
msgid "invalid section name '%s'"
msgstr ""
#: config.c:2473
#, c-format
msgid "%s has multiple values"
msgstr ""
#: config.c:2502
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
#: config.c:2754 config.c:3078
#, c-format
msgid "could not lock config file %s"
msgstr ""
#: config.c:2765
#, c-format
msgid "opening %s"
msgstr ""
#: config.c:2800 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr ""
#: config.c:2825
#, c-format
msgid "invalid config file %s"
msgstr ""
#: config.c:2838 config.c:3091
#, c-format
msgid "fstat on %s failed"
msgstr ""
#: config.c:2849
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
#: config.c:2858 config.c:3096
#, c-format
msgid "chmod on %s failed"
msgstr ""
#: config.c:2943 config.c:3193
#, c-format
msgid "could not write config file %s"
msgstr ""
#: config.c:2977
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr ""
#: config.c:3069
#, c-format
msgid "invalid section name: %s"
msgstr ""
#: config.c:3236
#, c-format
msgid "missing value for '%s'"
msgstr ""
#: connect.c:61
msgid "the remote end hung up upon initial contact"
msgstr ""
#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
#: connect.c:81
#, c-format
msgid "server doesn't support '%s'"
msgstr ""
#: connect.c:103
#, c-format
msgid "server doesn't support feature '%s'"
msgstr ""
#: connect.c:114
msgid "expected flush after capabilities"
msgstr ""
#: connect.c:233
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
#: connect.c:252
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
#: connect.c:273
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
#: connect.c:275
msgid "repository on the other end cannot be shallow"
msgstr ""
#: connect.c:313
msgid "invalid packet"
msgstr ""
#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
#: connect.c:845 connect.c:1175
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
#: connect.c:928
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
#: connect.c:1123
msgid "ssh variant 'simple' does not support -4"
msgstr ""
#: connect.c:1135
msgid "ssh variant 'simple' does not support -6"
msgstr ""
#: connect.c:1152
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
#: connect.c:1264
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
#: connect.c:1311
msgid "unable to fork"
msgstr ""
#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
msgid "Checking connectivity"
msgstr ""
#: connected.c:110
msgid "Could not run 'git rev-list'"
msgstr ""
#: connected.c:130
msgid "failed write to rev-list"
msgstr ""
#: connected.c:137
msgid "failed to close rev-list's stdin"
msgstr ""
#: convert.c:194
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
#: convert.c:207
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
#: convert.c:209
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
#: convert.c:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
#: convert.c:219
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
#: convert.c:284
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
#: convert.c:291
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
msgstr ""
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
#: convert.c:419 convert.c:490
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
#: convert.c:462
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
#: convert.c:668
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
#: convert.c:688
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
#: convert.c:695
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
#: convert.c:730 convert.c:733
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
#: convert.c:736 convert.c:791
#, c-format
msgid "external filter '%s' failed"
msgstr ""
#: convert.c:839
msgid "unexpected filter type"
msgstr ""
#: convert.c:850
msgid "path name too long for external filter"
msgstr ""
#: convert.c:924
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
#: convert.c:1223
msgid "true/false are no valid working-tree-encodings"
msgstr ""
#: convert.c:1411 convert.c:1445
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
#: convert.c:1489
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
#: date.c:138
msgid "in the future"
msgstr ""
#: date.c:144
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:151
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:158
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:165
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:171
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:178
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:189
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:192
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
#: date.c:197 date.c:202
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] ""
msgstr[1] ""
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr ""
#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr ""
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr ""
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr ""
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr ""
#: diffcore-rename.c:543
msgid "Performing inexact rename detection"
msgstr ""
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
#: diff-no-index.c:263
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr ""
#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
#: diff.c:324
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
#: diff.c:332
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
#: diff.c:4202
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
#: diff.c:4547
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
#: diff.c:4550
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
#: diff.c:4628
msgid "--follow requires exactly one pathspec"
msgstr ""
#: diff.c:4676
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr ""
#: diff.c:4713
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
#: diff.c:4798
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
#: diff.c:4822
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
#: diff.c:4836
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
#: diff.c:4886 diff.c:4892
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
#: diff.c:4904
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
#: diff.c:4925
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
#: diff.c:4944
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
#: diff.c:4984
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
#: diff.c:5020 diff.c:5040
#, c-format
msgid "invalid argument to %s"
msgstr ""
#: diff.c:5178
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
#: diff.c:5234
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
#: diff.c:5257
msgid "Diff output format options"
msgstr ""
#: diff.c:5259 diff.c:5265
msgid "generate patch"
msgstr ""
#: diff.c:5262 builtin/log.c:173
msgid "suppress diff output"
msgstr ""
#: diff.c:5267 diff.c:5381 diff.c:5388
msgid "<n>"
msgstr ""
#: diff.c:5268 diff.c:5271
msgid "generate diffs with <n> lines context"
msgstr ""
#: diff.c:5273
msgid "generate the diff in raw format"
msgstr ""
#: diff.c:5276
msgid "synonym for '-p --raw'"
msgstr ""
#: diff.c:5280
msgid "synonym for '-p --stat'"
msgstr ""
#: diff.c:5284
msgid "machine friendly --stat"
msgstr ""
#: diff.c:5287
msgid "output only the last line of --stat"
msgstr ""
#: diff.c:5289 diff.c:5297
msgid "<param1,param2>..."
msgstr ""
#: diff.c:5290
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
#: diff.c:5294
msgid "synonym for --dirstat=cumulative"
msgstr ""
#: diff.c:5298
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
#: diff.c:5302
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
#: diff.c:5305
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
#: diff.c:5308
msgid "show only names of changed files"
msgstr ""
#: diff.c:5311
msgid "show only names and status of changed files"
msgstr ""
#: diff.c:5313
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
#: diff.c:5314
msgid "generate diffstat"
msgstr ""
#: diff.c:5316 diff.c:5319 diff.c:5322
msgid "<width>"
msgstr ""
#: diff.c:5317
msgid "generate diffstat with a given width"
msgstr ""
#: diff.c:5320
msgid "generate diffstat with a given name width"
msgstr ""
#: diff.c:5323
msgid "generate diffstat with a given graph width"
msgstr ""
#: diff.c:5325
msgid "<count>"
msgstr ""
#: diff.c:5326
msgid "generate diffstat with limited lines"
msgstr ""
#: diff.c:5329
msgid "generate compact summary in diffstat"
msgstr ""
#: diff.c:5332
msgid "output a binary diff that can be applied"
msgstr ""
#: diff.c:5335
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
#: diff.c:5337
msgid "show colored diff"
msgstr ""
#: diff.c:5338
msgid "<kind>"
msgstr ""
#: diff.c:5339
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
#: diff.c:5342
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
msgid "<prefix>"
msgstr ""
#: diff.c:5346
msgid "show the given source prefix instead of \"a/\""
msgstr ""
#: diff.c:5349
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
#: diff.c:5352
msgid "prepend an additional prefix to every line of output"
msgstr ""
#: diff.c:5355
msgid "do not show any source or destination prefix"
msgstr ""
#: diff.c:5358
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
#: diff.c:5362 diff.c:5367 diff.c:5372
msgid "<char>"
msgstr ""
#: diff.c:5363
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
#: diff.c:5368
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
#: diff.c:5373
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
#: diff.c:5376
msgid "Diff rename options"
msgstr ""
#: diff.c:5377
msgid "<n>[/<m>]"
msgstr ""
#: diff.c:5378
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
#: diff.c:5382
msgid "detect renames"
msgstr ""
#: diff.c:5386
msgid "omit the preimage for deletes"
msgstr ""
#: diff.c:5389
msgid "detect copies"
msgstr ""
#: diff.c:5393
msgid "use unmodified files as source to find copies"
msgstr ""
#: diff.c:5395
msgid "disable rename detection"
msgstr ""
#: diff.c:5398
msgid "use empty blobs as rename source"
msgstr ""
#: diff.c:5400
msgid "continue listing the history of a file beyond renames"
msgstr ""
#: diff.c:5403
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
#: diff.c:5405
msgid "Diff algorithm options"
msgstr ""
#: diff.c:5407
msgid "produce the smallest possible diff"
msgstr ""
#: diff.c:5410
msgid "ignore whitespace when comparing lines"
msgstr ""
#: diff.c:5413
msgid "ignore changes in amount of whitespace"
msgstr ""
#: diff.c:5416
msgid "ignore changes in whitespace at EOL"
msgstr ""
#: diff.c:5419
msgid "ignore carrier-return at the end of line"
msgstr ""
#: diff.c:5422
msgid "ignore changes whose lines are all blank"
msgstr ""
#: diff.c:5425
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
#: diff.c:5428
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
#: diff.c:5432
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
#: diff.c:5434
msgid "<algorithm>"
msgstr ""
#: diff.c:5435
msgid "choose a diff algorithm"
msgstr ""
#: diff.c:5437
msgid "<text>"
msgstr ""
#: diff.c:5438
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
#: diff.c:5440 diff.c:5449 diff.c:5452
msgid "<mode>"
msgstr ""
#: diff.c:5441
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
#: diff.c:5443 diff.c:5446 diff.c:5491
msgid "<regex>"
msgstr ""
#: diff.c:5444
msgid "use <regex> to decide what a word is"
msgstr ""
#: diff.c:5447
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
#: diff.c:5450
msgid "moved lines of code are colored differently"
msgstr ""
#: diff.c:5453
msgid "how white spaces are ignored in --color-moved"
msgstr ""
#: diff.c:5456
msgid "Other diff options"
msgstr ""
#: diff.c:5458
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
#: diff.c:5462
msgid "treat all files as text"
msgstr ""
#: diff.c:5464
msgid "swap two inputs, reverse the diff"
msgstr ""
#: diff.c:5466
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
#: diff.c:5468
msgid "disable all output of the program"
msgstr ""
#: diff.c:5470
msgid "allow an external diff helper to be executed"
msgstr ""
#: diff.c:5472
msgid "run external text conversion filters when comparing binary files"
msgstr ""
#: diff.c:5474
msgid "<when>"
msgstr ""
#: diff.c:5475
msgid "ignore changes to submodules in the diff generation"
msgstr ""
#: diff.c:5478
msgid "<format>"
msgstr ""
#: diff.c:5479
msgid "specify how differences in submodules are shown"
msgstr ""
#: diff.c:5483
msgid "hide 'git add -N' entries from the index"
msgstr ""
#: diff.c:5486
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
#: diff.c:5488
msgid "<string>"
msgstr ""
#: diff.c:5489
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
#: diff.c:5492
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
#: diff.c:5495
msgid "show all changes in the changeset with -S or -G"
msgstr ""
#: diff.c:5498
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
#: diff.c:5501
msgid "control the order in which files appear in the output"
msgstr ""
#: diff.c:5502
msgid "<object-id>"
msgstr ""
#: diff.c:5503
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
#: diff.c:5505
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#: diff.c:5506
msgid "select files by diff type"
msgstr ""
#: diff.c:5508
msgid "<file>"
msgstr ""
#: diff.c:5509
msgid "Output to a specific file"
msgstr ""
#: diff.c:6164
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
#: diff.c:6167
msgid "only found copies from modified paths due to too many files."
msgstr ""
#: diff.c:6170
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
#: dir.c:695 dir.c:724 dir.c:737
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr ""
#: dir.c:754 dir.c:768
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr ""
#: dir.c:786
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
#: dir.c:796
msgid "disabling cone pattern matching"
msgstr ""
#: dir.c:1173
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
#: dir.c:2144
#, c-format
msgid "could not open directory '%s'"
msgstr ""
#: dir.c:2479
msgid "failed to get kernel name and information"
msgstr ""
#: dir.c:2603
msgid "untracked cache is disabled on this system or location"
msgstr ""
#: dir.c:3407
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
#: dir.c:3452 dir.c:3457
#, c-format
msgid "could not create directories for %s"
msgstr ""
#: dir.c:3486
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
#: entry.c:178
msgid "Filtering content"
msgstr ""
#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr ""
#: environment.c:149
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
#: environment.c:331
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr ""
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr ""
#: fetch-pack.c:150
msgid "git fetch-pack: expected shallow list"
msgstr ""
#: fetch-pack.c:153
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
#: fetch-pack.c:164
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
#: fetch-pack.c:184
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
#: fetch-pack.c:195
msgid "unable to write to remote"
msgstr ""
#: fetch-pack.c:257
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
#: fetch-pack.c:356 fetch-pack.c:1340
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
#: fetch-pack.c:362 fetch-pack.c:1346
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
#: fetch-pack.c:364 fetch-pack.c:1348
#, c-format
msgid "object not found: %s"
msgstr ""
#: fetch-pack.c:367 fetch-pack.c:1351
#, c-format
msgid "error in object: %s"
msgstr ""
#: fetch-pack.c:369 fetch-pack.c:1353
#, c-format
msgid "no shallow found: %s"
msgstr ""
#: fetch-pack.c:372 fetch-pack.c:1357
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
#: fetch-pack.c:414
#, c-format
msgid "got %s %d %s"
msgstr ""
#: fetch-pack.c:431
#, c-format
msgid "invalid commit %s"
msgstr ""
#: fetch-pack.c:462
msgid "giving up"
msgstr ""
#: fetch-pack.c:475 progress.c:323
msgid "done"
msgstr ""
#: fetch-pack.c:487
#, c-format
msgid "got %s (%d) %s"
msgstr ""
#: fetch-pack.c:533
#, c-format
msgid "Marking %s as complete"
msgstr ""
#: fetch-pack.c:754
#, c-format
msgid "already have %s (%s)"
msgstr ""
#: fetch-pack.c:818
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
#: fetch-pack.c:826
msgid "protocol error: bad pack header"
msgstr ""
#: fetch-pack.c:900
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
#: fetch-pack.c:916
#, c-format
msgid "%s failed"
msgstr ""
#: fetch-pack.c:918
msgid "error in sideband demultiplexer"
msgstr ""
#: fetch-pack.c:965
#, c-format
msgid "Server version is %.*s"
msgstr ""
#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
#, c-format
msgid "Server supports %s"
msgstr ""
#: fetch-pack.c:972
msgid "Server does not support shallow clients"
msgstr ""
#: fetch-pack.c:1032
msgid "Server does not support --shallow-since"
msgstr ""
#: fetch-pack.c:1037
msgid "Server does not support --shallow-exclude"
msgstr ""
#: fetch-pack.c:1041
msgid "Server does not support --deepen"
msgstr ""
#: fetch-pack.c:1058
msgid "no common commits"
msgstr ""
#: fetch-pack.c:1070 fetch-pack.c:1536
msgid "git fetch-pack: fetch failed."
msgstr ""
#: fetch-pack.c:1209
msgid "Server does not support shallow requests"
msgstr ""
#: fetch-pack.c:1216
msgid "Server supports filter"
msgstr ""
#: fetch-pack.c:1239
msgid "unable to write request to remote"
msgstr ""
#: fetch-pack.c:1257
#, c-format
msgid "error reading section header '%s'"
msgstr ""
#: fetch-pack.c:1263
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
#: fetch-pack.c:1303
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
#: fetch-pack.c:1308
#, c-format
msgid "error processing acks: %d"
msgstr ""
#: fetch-pack.c:1318
msgid "expected packfile to be sent after 'ready'"
msgstr ""
#: fetch-pack.c:1320
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
#: fetch-pack.c:1362
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
#: fetch-pack.c:1409
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
#: fetch-pack.c:1414
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
#: fetch-pack.c:1419
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
#: fetch-pack.c:1762
msgid "no matching remote head"
msgstr ""
#: fetch-pack.c:1785 builtin/clone.c:689
msgid "remote did not send all necessary objects"
msgstr ""
#: fetch-pack.c:1812
#, c-format
msgid "no such remote ref %s"
msgstr ""
#: fetch-pack.c:1815
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
#: gpg-interface.c:408
msgid "gpg failed to sign the data"
msgstr ""
#: gpg-interface.c:434
msgid "could not create temporary file"
msgstr ""
#: gpg-interface.c:437
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
#: grep.c:668
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
#: grep.c:2128
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
#: grep.c:2156
#, c-format
msgid "'%s': short read"
msgstr ""
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
msgstr ""
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
msgstr ""
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
msgstr ""
#: help.c:26
msgid "grow, mark and tweak your common history"
msgstr ""
#: help.c:27
msgid "collaborate (see also: git help workflows)"
msgstr ""
#: help.c:31
msgid "Main Porcelain Commands"
msgstr ""
#: help.c:32
msgid "Ancillary Commands / Manipulators"
msgstr ""
#: help.c:33
msgid "Ancillary Commands / Interrogators"
msgstr ""
#: help.c:34
msgid "Interacting with Others"
msgstr ""
#: help.c:35
msgid "Low-level Commands / Manipulators"
msgstr ""
#: help.c:36
msgid "Low-level Commands / Interrogators"
msgstr ""
#: help.c:37
msgid "Low-level Commands / Syncing Repositories"
msgstr ""
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
msgstr ""
#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr ""
#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr ""
#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
#: help.c:403
msgid "The common Git guides are:"
msgstr ""
#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
#: help.c:517
msgid "External commands"
msgstr ""
#: help.c:532
msgid "Command aliases"
msgstr ""
#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
#: help.c:699
msgid ""
"\n"
"The most similar command is"
msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
msgstr[1] ""
#: help.c:714
msgid "git version [<options>]"
msgstr ""
#: help.c:783
#, c-format
msgid "%s: %s - %s"
msgstr ""
#: help.c:787
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
msgstr[1] ""
#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
"Run\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"to set your account's default identity.\n"
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr ""
#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr ""
#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr ""
#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr ""
#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr ""
#: ident.c:436 builtin/commit.c:635
#, c-format
msgid "invalid date format: %s"
msgstr ""
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
#: list-objects.c:140
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
#: list-objects.c:375
#, c-format
msgid "unable to load root tree for commit %s"
msgstr ""
#: list-objects-filter.c:492
#, c-format
msgid "unable to access sparse blob in '%s'"
msgstr ""
#: list-objects-filter.c:495
#, c-format
msgid "unable to parse sparse filter data in %s"
msgstr ""
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr ""
#: list-objects-filter-options.c:73
msgid "sparse:path filters support has been dropped"
msgstr ""
#: list-objects-filter-options.c:86
#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
#: list-objects-filter-options.c:102
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr ""
#: list-objects-filter-options.c:144
msgid "expected something after combine:"
msgstr ""
#: list-objects-filter-options.c:226
msgid "multiple filter-specs cannot be combined"
msgstr ""
#: lockfile.c:151
#, 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:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr ""
#: merge.c:41
msgid "failed to read the cache"
msgstr ""
#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr ""
#: merge-recursive.c:356
msgid "(bad commit)\n"
msgstr ""
#: merge-recursive.c:379
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
#: merge-recursive.c:388
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
#: merge-recursive.c:874
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
#: merge-recursive.c:885
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
#: merge-recursive.c:899 merge-recursive.c:918
msgid ": perhaps a D/F conflict?"
msgstr ""
#: merge-recursive.c:908
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
#: merge-recursive.c:949 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
#: merge-recursive.c:954
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
#: merge-recursive.c:979
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
#: merge-recursive.c:990
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
#: merge-recursive.c:995
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
#: merge-recursive.c:1198
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
#: merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
#: merge-recursive.c:1251
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
#: merge-recursive.c:1255
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
#: merge-recursive.c:1256
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
#: merge-recursive.c:1259
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"by using:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"which will accept this suggestion.\n"
msgstr ""
#: merge-recursive.c:1268
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
#: merge-recursive.c:1341
msgid "Failed to execute internal merge"
msgstr ""
#: merge-recursive.c:1346
#, c-format
msgid "Unable to add %s to database"
msgstr ""
#: merge-recursive.c:1378
#, c-format
msgid "Auto-merging %s"
msgstr ""
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
#: merge-recursive.c:1474
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
#: merge-recursive.c:1479
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
#: merge-recursive.c:1491
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
#: merge-recursive.c:1526
msgid "rename"
msgstr ""
#: merge-recursive.c:1526
msgid "renamed"
msgstr ""
#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
#: merge-recursive.c:1587
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
#: merge-recursive.c:1676
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
#: merge-recursive.c:1681
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
#: merge-recursive.c:1708
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr ""
#: merge-recursive.c:1793
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
#: merge-recursive.c:2056
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
#: merge-recursive.c:2088
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
#: merge-recursive.c:2098
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
#: merge-recursive.c:2190
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
#: merge-recursive.c:2435
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
#: merge-recursive.c:2961
#, c-format
msgid "cannot read object %s"
msgstr ""
#: merge-recursive.c:2964
#, c-format
msgid "object %s is not a blob"
msgstr ""
#: merge-recursive.c:3028
msgid "modify"
msgstr ""
#: merge-recursive.c:3028
msgid "modified"
msgstr ""
#: merge-recursive.c:3040
msgid "content"
msgstr ""
#: merge-recursive.c:3044
msgid "add/add"
msgstr ""
#: merge-recursive.c:3067
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
#: merge-recursive.c:3089 git-submodule.sh:1003
msgid "submodule"
msgstr ""
#: merge-recursive.c:3090
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
#: merge-recursive.c:3120
#, c-format
msgid "Adding as %s instead"
msgstr ""
#: merge-recursive.c:3203
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
#: merge-recursive.c:3206
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
#: merge-recursive.c:3210
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
#: merge-recursive.c:3213
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
#: merge-recursive.c:3327
#, c-format
msgid "Removing %s"
msgstr ""
#: merge-recursive.c:3350
msgid "file/directory"
msgstr ""
#: merge-recursive.c:3355
msgid "directory/file"
msgstr ""
#: merge-recursive.c:3362
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
#: merge-recursive.c:3371
#, c-format
msgid "Adding %s"
msgstr ""
#: merge-recursive.c:3380
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
#: merge-recursive.c:3424
msgid "Already up to date!"
msgstr ""
#: merge-recursive.c:3433
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
#: merge-recursive.c:3537
msgid "Merging:"
msgstr ""
#: merge-recursive.c:3550
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
#: merge-recursive.c:3600
msgid "merge returned no commit"
msgstr ""
#: merge-recursive.c:3659
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
#: merge-recursive.c:3756
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
msgid "Unable to write index."
msgstr ""
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
#: midx.c:84
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
#: midx.c:89
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
#: midx.c:94
#, c-format
msgid "hash version %u does not match"
msgstr ""
#: midx.c:108
msgid "invalid chunk offset (too large)"
msgstr ""
#: midx.c:132
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
#: midx.c:145
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
#: midx.c:147
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
#: midx.c:149
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
#: midx.c:151
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
#: midx.c:165
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
#: midx.c:210
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
#: midx.c:260
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
#: midx.c:288
msgid "error preparing packfile from multi-pack-index"
msgstr ""
#: midx.c:472
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
#: midx.c:478
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
#: midx.c:538
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
#: midx.c:842
msgid "Adding packfiles to multi-pack-index"
msgstr ""
#: midx.c:875
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
#: midx.c:973
msgid "Writing chunks to multi-pack-index"
msgstr ""
#: midx.c:1052
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
#: midx.c:1108
msgid "Looking for referenced packfiles"
msgstr ""
#: midx.c:1123
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
#: midx.c:1128
msgid "Verifying OID order in multi-pack-index"
msgstr ""
#: midx.c:1137
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
#: midx.c:1157
msgid "Sorting objects by packfile"
msgstr ""
#: midx.c:1164
msgid "Verifying object offsets"
msgstr ""
#: midx.c:1180
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
#: midx.c:1186
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
#: midx.c:1195
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
#: midx.c:1220
msgid "Counting referenced objects"
msgstr ""
#: midx.c:1230
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
#: midx.c:1388
msgid "could not start pack-objects"
msgstr ""
#: midx.c:1407
msgid "could not finish pack-objects"
msgstr ""
#: name-hash.c:537
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
#: name-hash.c:559
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
#: name-hash.c:565
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
#.
#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
msgstr ""
#: object.c:173
#, c-format
msgid "object %s is a %s, not a %s"
msgstr ""
#: object.c:233
#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr ""
#: object.c:266 object.c:278
#, c-format
msgid "hash mismatch %s"
msgstr ""
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
#, c-format
msgid "unable to get size of %s"
msgstr ""
#: parse-options.c:38
#, c-format
msgid "%s requires a value"
msgstr ""
#: parse-options.c:73
#, c-format
msgid "%s is incompatible with %s"
msgstr ""
#: parse-options.c:78
#, c-format
msgid "%s : incompatible with something else"
msgstr ""
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
#, c-format
msgid "%s takes no value"
msgstr ""
#: parse-options.c:94
#, c-format
msgid "%s isn't available"
msgstr ""
#: parse-options.c:217
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
#: parse-options.c:386
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
#: parse-options.c:420 parse-options.c:428
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
#: parse-options.c:857
#, c-format
msgid "unknown option `%s'"
msgstr ""
#: parse-options.c:859
#, c-format
msgid "unknown switch `%c'"
msgstr ""
#: parse-options.c:861
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
#: parse-options.c:885
msgid "..."
msgstr ""
#: parse-options.c:904
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#: parse-options.c:910
#, c-format
msgid " or: %s"
msgstr ""
#: parse-options.c:913
#, c-format
msgid " %s"
msgstr ""
#: parse-options.c:952
msgid "-NUM"
msgstr ""
#: parse-options.c:966
#, c-format
msgid "alias of --%s"
msgstr ""
#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr ""
#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr ""
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
#: pathspec.c:130
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
#: pathspec.c:148
msgid "Only one 'attr:' specification is allowed."
msgstr ""
#: pathspec.c:151
msgid "attr spec must not be empty"
msgstr ""
#: pathspec.c:194
#, c-format
msgid "invalid attribute name %s"
msgstr ""
#: pathspec.c:259
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
#: pathspec.c:266
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
#: pathspec.c:306
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
#: pathspec.c:327
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
#: pathspec.c:332
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
#: pathspec.c:370
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
#: pathspec.c:429
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
#: pathspec.c:442
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
#: pathspec.c:517
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
#: pathspec.c:527
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
#: pathspec.c:594
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
#: pathspec.c:639
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
#: pkt-line.c:92
msgid "unable to write flush packet"
msgstr ""
#: pkt-line.c:99
msgid "unable to write delim packet"
msgstr ""
#: pkt-line.c:106
msgid "flush packet write failed"
msgstr ""
#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr ""
#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr ""
#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr ""
#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr ""
#: pkt-line.c:295
msgid "read error"
msgstr ""
#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr ""
#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
#: pkt-line.c:362
#, c-format
msgid "remote error: %s"
msgstr ""
#: preload-index.c:119
msgid "Refreshing index"
msgstr ""
#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr ""
#: pretty.c:981
msgid "unable to parse --pretty format"
msgstr ""
#: promisor-remote.c:23
msgid "Remote with no URL"
msgstr ""
#: promisor-remote.c:58
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr ""
#: range-diff.c:75
msgid "could not start `log`"
msgstr ""
#: range-diff.c:77
msgid "could not read `log` output"
msgstr ""
#: range-diff.c:96 sequencer.c:5020
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
#: range-diff.c:122
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
#: range-diff.c:285
msgid "failed to generate diff"
msgstr ""
#: range-diff.c:518 range-diff.c:520
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
#: read-cache.c:680
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
#: read-cache.c:696
msgid "cannot create an empty blob in the object database"
msgstr ""
#: read-cache.c:718
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
#: read-cache.c:723
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr ""
#: read-cache.c:775
#, c-format
msgid "unable to index file '%s'"
msgstr ""
#: read-cache.c:794
#, c-format
msgid "unable to add '%s' to index"
msgstr ""
#: read-cache.c:805
#, c-format
msgid "unable to stat '%s'"
msgstr ""
#: read-cache.c:1330
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
#: read-cache.c:1536
msgid "Refresh index"
msgstr ""
#: read-cache.c:1651
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
#: read-cache.c:1661
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
#: read-cache.c:1717
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
#: read-cache.c:1720
#, c-format
msgid "bad index version %d"
msgstr ""
#: read-cache.c:1729
msgid "bad index file sha1 signature"
msgstr ""
#: read-cache.c:1759
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
#: read-cache.c:1761
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
#: read-cache.c:1798
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
#: read-cache.c:1814
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
#: read-cache.c:1871
msgid "unordered stage entries in index"
msgstr ""
#: read-cache.c:1874
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
#: read-cache.c:1877
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr ""
#: read-cache.c:2124
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
#: read-cache.c:2137
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
#: read-cache.c:2170
#, c-format
msgid "%s: index file open failed"
msgstr ""
#: read-cache.c:2174
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
#: read-cache.c:2178
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
#: read-cache.c:2182
#, c-format
msgid "%s: unable to map index file"
msgstr ""
#: read-cache.c:2224
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
#: read-cache.c:2251
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
#: read-cache.c:2283
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
#: read-cache.c:2330
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
#, c-format
msgid "could not close '%s'"
msgstr ""
#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
#, c-format
msgid "could not stat '%s'"
msgstr ""
#: read-cache.c:3142
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
#: read-cache.c:3154
#, c-format
msgid "unable to unlink: %s"
msgstr ""
#: read-cache.c:3179
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
#: read-cache.c:3328
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
#: rebase-interactive.c:11
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
#: rebase-interactive.c:33
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
#: rebase-interactive.c:42
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
#: rebase-interactive.c:63
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] ""
msgstr[1] ""
#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"To continue rebase after editing, run:\n"
" git rebase --continue\n"
"\n"
msgstr ""
#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
#, c-format
msgid "could not write '%s'"
msgstr ""
#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
#: builtin/rebase.c:234
#, c-format
msgid "could not write '%s'."
msgstr ""
#: rebase-interactive.c:193
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
#: rebase-interactive.c:200
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"Use 'git config rebase.missingCommitsCheck' to change the level of "
"warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
#: builtin/rebase.c:246
#, c-format
msgid "could not read '%s'."
msgstr ""
#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
#: refs.c:669 ref-filter.c:2098
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr ""
#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr ""
#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr ""
#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr ""
#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
#: wrapper.c:620
#, c-format
msgid "could not write to '%s'"
msgstr ""
#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
#: builtin/rebase.c:1029
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr ""
#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
#: refs.c:2023
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
#: refs.c:2055
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
#: refs.c:2151 refs.c:2181
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
#: refs.c:2157 refs.c:2192
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
#: refs/files-backend.c:1233
#, c-format
msgid "could not remove reference %s"
msgstr ""
#: refs/files-backend.c:1247 refs/packed-backend.c:1541
#: refs/packed-backend.c:1551
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
#: refs/files-backend.c:1250 refs/packed-backend.c:1554
#, c-format
msgid "could not delete references: %s"
msgstr ""
#: refspec.c:137
#, c-format
msgid "invalid refspec '%s'"
msgstr ""
#: ref-filter.c:42 wt-status.c:1938
msgid "gone"
msgstr ""
#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr ""
#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr ""
#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr ""
#: ref-filter.c:165
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
#: ref-filter.c:167
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
#: ref-filter.c:189
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
#: ref-filter.c:195
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
#: ref-filter.c:250
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
#: ref-filter.c:272
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
#: ref-filter.c:280
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
#: ref-filter.c:292
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
#: ref-filter.c:301
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
#: ref-filter.c:323
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
#: ref-filter.c:352
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
#: ref-filter.c:354
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
#: ref-filter.c:369
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
#: ref-filter.c:373
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
#: ref-filter.c:403
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
#: ref-filter.c:415
#, c-format
msgid "unrecognized position:%s"
msgstr ""
#: ref-filter.c:422
#, c-format
msgid "unrecognized width:%s"
msgstr ""
#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
#: ref-filter.c:439
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
#: ref-filter.c:457
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
#: ref-filter.c:559
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
#: ref-filter.c:586
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
#: ref-filter.c:590
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
#: ref-filter.c:714
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
#: ref-filter.c:777
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
#: ref-filter.c:779
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
#: ref-filter.c:781
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
#: ref-filter.c:809
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
#: ref-filter.c:811
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
#: ref-filter.c:813
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
#: ref-filter.c:828
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
#: ref-filter.c:885
#, c-format
msgid "malformed format string %s"
msgstr ""
#: ref-filter.c:1488
#, c-format
msgid "no branch, rebasing %s"
msgstr ""
#: ref-filter.c:1491
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr ""
#: ref-filter.c:1494
#, c-format
msgid "no branch, bisect started on %s"
msgstr ""
#: ref-filter.c:1504
msgid "no branch"
msgstr ""
#: ref-filter.c:1540 ref-filter.c:1749
#, c-format
msgid "missing object %s for %s"
msgstr ""
#: ref-filter.c:1550
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
#: ref-filter.c:2004
#, c-format
msgid "malformed object at '%s'"
msgstr ""
#: ref-filter.c:2093
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
#: ref-filter.c:2389
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
#: ref-filter.c:2489
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr ""
#: ref-filter.c:2492
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr ""
#: ref-filter.c:2502
#, c-format
msgid "malformed object name %s"
msgstr ""
#: ref-filter.c:2507
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
#: remote.c:366
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
#: remote.c:414
msgid "more than one receivepack given, using the first"
msgstr ""
#: remote.c:422
msgid "more than one uploadpack given, using the first"
msgstr ""
#: remote.c:612
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
#: remote.c:616
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
#: remote.c:620
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
#: remote.c:688
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
#: remote.c:698
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
#: remote.c:1004
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
#: remote.c:1009
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
#: remote.c:1024
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
"\n"
"- Looking for a ref that matches '%s' on the remote side.\n"
"- Checking if the <src> being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
#: remote.c:1044
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
#: remote.c:1049
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1054
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Did you mean to tag a new tree by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1059
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Did you mean to tag a new blob by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
#: remote.c:1095
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
#: remote.c:1106
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
#: remote.c:1118
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
#: remote.c:1125
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
#: remote.c:1628 remote.c:1729
msgid "HEAD does not point to a branch"
msgstr ""
#: remote.c:1637
#, c-format
msgid "no such branch: '%s'"
msgstr ""
#: remote.c:1640
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
#: remote.c:1646
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
#: remote.c:1661
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
#: remote.c:1673
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
#: remote.c:1683
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
#: remote.c:1696
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
#: remote.c:1718
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
#: remote.c:1844
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
#: remote.c:1857
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
#: remote.c:2020
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
#: remote.c:2024
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
#: remote.c:2027
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
#: remote.c:2031
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
#: remote.c:2034
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
#: remote.c:2038
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:2044
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
#: remote.c:2047
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:2055
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
#: remote.c:2058
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
msgstr[1] ""
#: remote.c:2068
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
#: remote.c:2251
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
msgstr ""
#: replace-object.c:30
#, c-format
msgid "duplicate replace ref: %s"
msgstr ""
#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
msgstr ""
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr ""
#: rerere.c:264 rerere.c:269
msgid "unable to write rerere record"
msgstr ""
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr ""
#: rerere.c:498
#, c-format
msgid "failed to flush '%s'"
msgstr ""
#: rerere.c:503 rerere.c:1039
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr ""
#: rerere.c:684
#, c-format
msgid "failed utime() on '%s'"
msgstr ""
#: rerere.c:694
#, c-format
msgid "writing '%s' failed"
msgstr ""
#: rerere.c:714
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr ""
#: rerere.c:753
#, c-format
msgid "Recorded resolution for '%s'."
msgstr ""
#: rerere.c:788
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr ""
#: rerere.c:803
#, c-format
msgid "cannot unlink stray '%s'"
msgstr ""
#: rerere.c:807
#, c-format
msgid "Recorded preimage for '%s'"
msgstr ""
#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
msgstr ""
#: rerere.c:1057
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr ""
#: rerere.c:1068 rerere.c:1075
#, c-format
msgid "no remembered resolution for '%s'"
msgstr ""
#: rerere.c:1077
#, c-format
msgid "cannot unlink '%s'"
msgstr ""
#: rerere.c:1087
#, c-format
msgid "Updated preimage for '%s'"
msgstr ""
#: rerere.c:1096
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr ""
#: rerere.c:1199
msgid "unable to open rr-cache directory"
msgstr ""
#: revision.c:2497
msgid "your current branch appears to be broken"
msgstr ""
#: revision.c:2500
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
#: revision.c:2708
msgid "--first-parent is incompatible with --bisect"
msgstr ""
#: revision.c:2712
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
#: run-command.c:763
msgid "open /dev/null failed"
msgstr ""
#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
#: send-pack.c:144
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
#: send-pack.c:146
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
#: send-pack.c:148
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
#: send-pack.c:309
msgid "failed to sign the push certificate"
msgstr ""
#: send-pack.c:423
msgid "the receiving end does not support --signed push"
msgstr ""
#: send-pack.c:425
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
#: send-pack.c:437
msgid "the receiving end does not support --atomic push"
msgstr ""
#: send-pack.c:442
msgid "the receiving end does not support push options"
msgstr ""
#: sequencer.c:191
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
#: sequencer.c:296
#, c-format
msgid "could not delete '%s'"
msgstr ""
#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr ""
#: sequencer.c:325
msgid "revert"
msgstr ""
#: sequencer.c:327
msgid "cherry-pick"
msgstr ""
#: sequencer.c:329
msgid "rebase"
msgstr ""
#: sequencer.c:331
#, c-format
msgid "unknown action: %d"
msgstr ""
#: sequencer.c:389
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
#: sequencer.c:392
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
#: sequencer.c:405 sequencer.c:2901
#, c-format
msgid "could not lock '%s'"
msgstr ""
#: sequencer.c:412
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
#: sequencer.c:3185
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
#: builtin/rebase.c:593
#, c-format
msgid "could not read '%s'"
msgstr ""
#: sequencer.c:466
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
#: sequencer.c:470
msgid "commit your changes or stash them to proceed."
msgstr ""
#: sequencer.c:502
#, c-format
msgid "%s: fast-forward"
msgstr ""
#: sequencer.c:541 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
#: sequencer.c:635
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
#: sequencer.c:652
msgid "unable to update cache tree"
msgstr ""
#: sequencer.c:666
msgid "could not resolve HEAD commit"
msgstr ""
#: sequencer.c:746
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
#: sequencer.c:757
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
#: sequencer.c:804
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
#: sequencer.c:809
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
#: sequencer.c:814
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
#: sequencer.c:818
#, c-format
msgid "unknown variable '%s'"
msgstr ""
#: sequencer.c:823
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
#: sequencer.c:825
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
#: sequencer.c:827
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
#: sequencer.c:876
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
" git commit --amend %s\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit %s\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
#: sequencer.c:1148
msgid "'prepare-commit-msg' hook failed"
msgstr ""
#: sequencer.c:1154
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly. Run the\n"
"following command and follow the instructions in your editor to edit\n"
"your configuration file:\n"
"\n"
" git config --global --edit\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
#: sequencer.c:1167
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
#: sequencer.c:1209
msgid "couldn't look up newly created commit"
msgstr ""
#: sequencer.c:1211
msgid "could not parse newly created commit"
msgstr ""
#: sequencer.c:1257
msgid "unable to resolve HEAD after creating commit"
msgstr ""
#: sequencer.c:1259
msgid "detached HEAD"
msgstr ""
#: sequencer.c:1263
msgid " (root-commit)"
msgstr ""
#: sequencer.c:1284
msgid "could not parse HEAD"
msgstr ""
#: sequencer.c:1286
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
msgid "could not parse HEAD commit"
msgstr ""
#: sequencer.c:1342 sequencer.c:1968
msgid "unable to parse commit author"
msgstr ""
#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
msgid "git write-tree failed to write a tree"
msgstr ""
#: sequencer.c:1386 sequencer.c:1447
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
#: builtin/merge.c:911
msgid "failed to write commit object"
msgstr ""
#: sequencer.c:1474
#, c-format
msgid "could not parse commit %s"
msgstr ""
#: sequencer.c:1479
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
#: sequencer.c:1562 sequencer.c:1673
#, c-format
msgid "unknown command: %d"
msgstr ""
#: sequencer.c:1620 sequencer.c:1645
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
#: sequencer.c:1630
msgid "need a HEAD to fixup"
msgstr ""
#: sequencer.c:1632 sequencer.c:3212
msgid "could not read HEAD"
msgstr ""
#: sequencer.c:1634
msgid "could not read HEAD's commit message"
msgstr ""
#: sequencer.c:1640
#, c-format
msgid "cannot write '%s'"
msgstr ""
#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr ""
#: sequencer.c:1655
#, c-format
msgid "could not read commit message of %s"
msgstr ""
#: sequencer.c:1662
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
#: sequencer.c:1668
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
#: sequencer.c:1756
msgid "your index file is unmerged."
msgstr ""
#: sequencer.c:1763
msgid "cannot fixup root commit"
msgstr ""
#: sequencer.c:1782
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
#: sequencer.c:1790 sequencer.c:1798
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
#: sequencer.c:1804
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c:1823
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
#: sequencer.c:1888
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
#: sequencer.c:1943
#, c-format
msgid "could not revert %s... %s"
msgstr ""
#: sequencer.c:1944
#, c-format
msgid "could not apply %s... %s"
msgstr ""
#: sequencer.c:1961
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
#: sequencer.c:2018
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
#: sequencer.c:2025
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
#: sequencer.c:2102
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
#: sequencer.c:2111
#, c-format
msgid "missing arguments for %s"
msgstr ""
#: sequencer.c:2142
#, c-format
msgid "could not parse '%s'"
msgstr ""
#: sequencer.c:2203
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
#: sequencer.c:2214
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
#: sequencer.c:2298
msgid "cancelling a cherry picking in progress"
msgstr ""
#: sequencer.c:2305
msgid "cancelling a revert in progress"
msgstr ""
#: sequencer.c:2349
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
#: sequencer.c:2351
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
#: sequencer.c:2356
msgid "no commits parsed."
msgstr ""
#: sequencer.c:2367
msgid "cannot cherry-pick during a revert."
msgstr ""
#: sequencer.c:2369
msgid "cannot revert during a cherry-pick."
msgstr ""
#: sequencer.c:2447
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
#: sequencer.c:2540
msgid "unusable squash-onto"
msgstr ""
#: sequencer.c:2556
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
#: sequencer.c:2644 sequencer.c:4361
msgid "empty commit set passed"
msgstr ""
#: sequencer.c:2660
msgid "revert is already in progress"
msgstr ""
#: sequencer.c:2662
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
#: sequencer.c:2665
msgid "cherry-pick is already in progress"
msgstr ""
#: sequencer.c:2667
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
#: sequencer.c:2681
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
#: sequencer.c:2696
msgid "could not lock HEAD"
msgstr ""
#: sequencer.c:2756 sequencer.c:4099
msgid "no cherry-pick or revert in progress"
msgstr ""
#: sequencer.c:2758 sequencer.c:2769
msgid "cannot resolve HEAD"
msgstr ""
#: sequencer.c:2760 sequencer.c:2804
msgid "cannot abort from a branch yet to be born"
msgstr ""
#: sequencer.c:2790 builtin/grep.c:724
#, c-format
msgid "cannot open '%s'"
msgstr ""
#: sequencer.c:2792
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
#: sequencer.c:2793
msgid "unexpected end of file"
msgstr ""
#: sequencer.c:2799
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
#: sequencer.c:2810
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
#: sequencer.c:2851
msgid "no revert in progress"
msgstr ""
#: sequencer.c:2859
msgid "no cherry-pick in progress"
msgstr ""
#: sequencer.c:2869
msgid "failed to skip the commit"
msgstr ""
#: sequencer.c:2876
msgid "there is nothing to skip"
msgstr ""
#: sequencer.c:2879
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
#: sequencer.c:3003 sequencer.c:4011
#, c-format
msgid "could not update %s"
msgstr ""
#: sequencer.c:3042 sequencer.c:3991
msgid "cannot read HEAD"
msgstr ""
#: sequencer.c:3059
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
#: sequencer.c:3067
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git commit --amend %s\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
" git rebase --continue\n"
msgstr ""
#: sequencer.c:3077
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
#: sequencer.c:3084
#, c-format
msgid "Could not merge %.*s"
msgstr ""
#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
#: sequencer.c:3129
#, c-format
msgid ""
"execution failed: %s\n"
"%sYou can fix the problem, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
#: sequencer.c:3135
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
#: sequencer.c:3141
#, c-format
msgid ""
"execution succeeded: %s\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
#: sequencer.c:3202
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
#: sequencer.c:3256
msgid "writing fake root commit"
msgstr ""
#: sequencer.c:3261
msgid "writing squash-onto"
msgstr ""
#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
#, c-format
msgid "failed to find tree of %s"
msgstr ""
#: sequencer.c:3344
#, c-format
msgid "could not resolve '%s'"
msgstr ""
#: sequencer.c:3375
msgid "cannot merge without a current revision"
msgstr ""
#: sequencer.c:3397
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
#: sequencer.c:3406
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
#: sequencer.c:3418
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
#: sequencer.c:3434
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
#: sequencer.c:3594
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
#: sequencer.c:3610
msgid "merge: Unable to write new index file"
msgstr ""
#: sequencer.c:3679 builtin/rebase.c:737
#, c-format
msgid "Applied autostash.\n"
msgstr ""
#: sequencer.c:3691
#, c-format
msgid "cannot store %s"
msgstr ""
#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
#: sequencer.c:3755
#, c-format
msgid "%s: not a valid OID"
msgstr ""
#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr ""
#: sequencer.c:3775
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
#: sequencer.c:3777
#, c-format
msgid "Stopped at %s\n"
msgstr ""
#: sequencer.c:3785
#, c-format
msgid ""
"Could not execute the todo command\n"
"\n"
" %.*s\n"
"It has been rescheduled; To edit the command before continuing, please\n"
"edit the todo list first:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
msgstr ""
#: sequencer.c:3869
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
#: sequencer.c:3940
#, c-format
msgid "unknown command %d"
msgstr ""
#: sequencer.c:3999
msgid "could not read orig-head"
msgstr ""
#: sequencer.c:4004
msgid "could not read 'onto'"
msgstr ""
#: sequencer.c:4018
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
#: sequencer.c:4111
msgid "cannot rebase: You have unstaged changes."
msgstr ""
#: sequencer.c:4120
msgid "cannot amend non-existing commit"
msgstr ""
#: sequencer.c:4122
#, c-format
msgid "invalid file: '%s'"
msgstr ""
#: sequencer.c:4124
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
#: sequencer.c:4127
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
#: sequencer.c:4163 sequencer.c:4202
#, c-format
msgid "could not write file: '%s'"
msgstr ""
#: sequencer.c:4217
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
#: sequencer.c:4224
msgid "could not commit staged changes."
msgstr ""
#: sequencer.c:4338
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
#: sequencer.c:4342
#, c-format
msgid "%s: bad revision"
msgstr ""
#: sequencer.c:4377
msgid "can't revert as initial commit"
msgstr ""
#: sequencer.c:4846
msgid "make_script: unhandled options"
msgstr ""
#: sequencer.c:4849
msgid "make_script: error preparing revisions"
msgstr ""
#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr ""
#: sequencer.c:5119
msgid "could not skip unnecessary pick commands"
msgstr ""
#: sequencer.c:5213
msgid "the script was already rearranged."
msgstr ""
#: setup.c:124
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr ""
#: setup.c:175
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
#: setup.c:188
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
#: setup.c:254
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
#: setup.c:273
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
#: setup.c:409
msgid "unable to set up work tree using invalid config"
msgstr ""
#: setup.c:413
msgid "this operation must be run in a work tree"
msgstr ""
#: setup.c:559
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
#: setup.c:567
msgid "unknown repository extensions found:"
msgstr ""
#: setup.c:586
#, c-format
msgid "error opening '%s'"
msgstr ""
#: setup.c:588
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
#: setup.c:590
#, c-format
msgid "error reading %s"
msgstr ""
#: setup.c:592
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
#: setup.c:594
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
#: setup.c:596
#, c-format
msgid "not a git repository: %s"
msgstr ""
#: setup.c:695
#, c-format
msgid "'$%s' too big"
msgstr ""
#: setup.c:709
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
#: setup.c:738 setup.c:740 setup.c:771
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
msgid "cannot come back to cwd"
msgstr ""
#: setup.c:870
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
#: setup.c:1108
msgid "Unable to read current working directory"
msgstr ""
#: setup.c:1117 setup.c:1123
#, c-format
msgid "cannot change to '%s'"
msgstr ""
#: setup.c:1128
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
#: setup.c:1134
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
#: setup.c:1245
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
#: setup.c:1289
msgid "open /dev/null or dup failed"
msgstr ""
#: setup.c:1304
msgid "fork failed"
msgstr ""
#: setup.c:1309
msgid "setsid failed"
msgstr ""
#: sha1-file.c:452
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
#: sha1-file.c:503
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
#: sha1-file.c:575
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
#: sha1-file.c:582
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
#: sha1-file.c:625
msgid "unable to fdopen alternates lockfile"
msgstr ""
#: sha1-file.c:643
msgid "unable to read alternates file"
msgstr ""
#: sha1-file.c:650
msgid "unable to move new alternates file into place"
msgstr ""
#: sha1-file.c:685
#, c-format
msgid "path '%s' does not exist"
msgstr ""
#: sha1-file.c:711
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
#: sha1-file.c:717
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
#: sha1-file.c:723
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
#: sha1-file.c:731
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
#: sha1-file.c:791
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
#: sha1-file.c:964
msgid "mmap failed"
msgstr ""
#: sha1-file.c:1128
#, c-format
msgid "object file %s is empty"
msgstr ""
#: sha1-file.c:1263 sha1-file.c:2443
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
#: sha1-file.c:1265 sha1-file.c:2447
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
#: sha1-file.c:1307
msgid "invalid object type"
msgstr ""
#: sha1-file.c:1391
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
#: sha1-file.c:1394
#, c-format
msgid "unable to unpack %s header"
msgstr ""
#: sha1-file.c:1400
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
#: sha1-file.c:1403
#, c-format
msgid "unable to parse %s header"
msgstr ""
#: sha1-file.c:1629
#, c-format
msgid "failed to read object %s"
msgstr ""
#: sha1-file.c:1633
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
#: sha1-file.c:1637
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
#: sha1-file.c:1641
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
#: sha1-file.c:1746
#, c-format
msgid "unable to write file %s"
msgstr ""
#: sha1-file.c:1753
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
#: sha1-file.c:1760
msgid "file write error"
msgstr ""
#: sha1-file.c:1780
msgid "error when closing loose object file"
msgstr ""
#: sha1-file.c:1845
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
#: sha1-file.c:1847
msgid "unable to create temporary file"
msgstr ""
#: sha1-file.c:1871
msgid "unable to write loose object file"
msgstr ""
#: sha1-file.c:1877
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
#: sha1-file.c:1881
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
#: sha1-file.c:1885
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
#: sha1-file.c:1895 builtin/pack-objects.c:1054
#, c-format
msgid "failed utime() on %s"
msgstr ""
#: sha1-file.c:1972
#, c-format
msgid "cannot read object for %s"
msgstr ""
#: sha1-file.c:2011
msgid "corrupt commit"
msgstr ""
#: sha1-file.c:2019
msgid "corrupt tag"
msgstr ""
#: sha1-file.c:2119
#, c-format
msgid "read error while indexing %s"
msgstr ""
#: sha1-file.c:2122
#, c-format
msgid "short read while indexing %s"
msgstr ""
#: sha1-file.c:2195 sha1-file.c:2205
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
#: sha1-file.c:2211
#, c-format
msgid "%s: unsupported file type"
msgstr ""
#: sha1-file.c:2235
#, c-format
msgid "%s is not a valid object"
msgstr ""
#: sha1-file.c:2237
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
#: sha1-file.c:2264 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr ""
#: sha1-file.c:2454 sha1-file.c:2507
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
#: sha1-file.c:2478
#, c-format
msgid "unable to mmap %s"
msgstr ""
#: sha1-file.c:2483
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
#: sha1-file.c:2489
#, c-format
msgid "unable to parse header of %s"
msgstr ""
#: sha1-file.c:2500
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
#: sha1-name.c:486
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
#: sha1-name.c:497
msgid "The candidates are:"
msgstr ""
#: sha1-name.c:796
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
#: sha1-name.c:916
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr ""
#: sha1-name.c:924
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr ""
#: sha1-name.c:1689
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr ""
#: sha1-name.c:1695
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
msgstr ""
#: sha1-name.c:1704
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr ""
#: sha1-name.c:1732
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"hint: Did you mean ':%d:%s'?"
msgstr ""
#: sha1-name.c:1748
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
msgstr ""
#: sha1-name.c:1756
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr ""
#: sha1-name.c:1758
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr ""
#: sha1-name.c:1771
msgid "relative path syntax can't be used outside working tree"
msgstr ""
#: sha1-name.c:1909
#, c-format
msgid "invalid object name '%.*s'."
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
#: strbuf.c:837
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
#: strbuf.c:839
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
#: strbuf.c:847
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
#: strbuf.c:849
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
#: strbuf.c:856
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
#: strbuf.c:858
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
#: strbuf.c:864
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
#: strbuf.c:866
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] ""
msgstr[1] ""
#: strbuf.c:1164
#, c-format
msgid "could not edit '%s'"
msgstr ""
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr ""
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
#: submodule.c:434
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr ""
#: submodule.c:815
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
#: submodule.c:995
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
#: submodule.c:1118
#, c-format
msgid "process for submodule '%s' failed"
msgstr ""
#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
#: submodule.c:1158
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr ""
#: submodule.c:1161
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr ""
#: submodule.c:1453
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr ""
#: submodule.c:1483
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr ""
#: submodule.c:1637
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
#: submodule.c:1662
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
#: submodule.c:1679
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
#: submodule.c:1720
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
#: submodule.c:1800
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
#: submodule.c:1813
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
#: submodule.c:1828
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
#: submodule.c:1855 submodule.c:2165
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
#: submodule.c:1876
msgid "could not reset submodule index"
msgstr ""
#: submodule.c:1918
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
#: submodule.c:1970
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
#: submodule.c:2038
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
#: submodule.c:2059
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
#: submodule.c:2071 submodule.c:2130
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
#: submodule.c:2075
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
#: submodule.c:2082
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
#: submodule.c:2209
msgid "could not start ls-files in .."
msgstr ""
#: submodule.c:2248
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
#: submodule-config.c:236
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr ""
#: submodule-config.c:303
msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
#: submodule-config.c:401
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
#: submodule-config.c:498
#, c-format
msgid "invalid value for %s"
msgstr ""
#: submodule-config.c:765
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
#, c-format
msgid "more than one %s"
msgstr ""
#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr ""
#: trailer.c:753
msgid "could not read from stdin"
msgstr ""
#: trailer.c:1011 wrapper.c:665
#, c-format
msgid "could not stat %s"
msgstr ""
#: trailer.c:1013
#, c-format
msgid "file %s is not a regular file"
msgstr ""
#: trailer.c:1015
#, c-format
msgid "file %s is not writable by user"
msgstr ""
#: trailer.c:1027
msgid "could not open temporary file"
msgstr ""
#: trailer.c:1067
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
msgstr ""
#: transport.c:214
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
#: transport.c:266
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
#: transport.c:267
msgid "server options require protocol version 2 or later"
msgstr ""
#: transport.c:632
msgid "could not parse transport.color.* config"
msgstr ""
#: transport.c:705
msgid "support for protocol v2 not implemented yet"
msgstr ""
#: transport.c:831
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
#: transport.c:897
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
#: transport.c:949
msgid "git-over-rsync is no longer supported"
msgstr ""
#: transport.c:1044
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
#: transport.c:1048
#, c-format
msgid ""
"\n"
"Please try\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"or cd to the path and use\n"
"\n"
"\tgit push\n"
"\n"
"to push them to a remote.\n"
"\n"
msgstr ""
#: transport.c:1056
msgid "Aborting."
msgstr ""
#: transport.c:1201
msgid "failed to push all needed submodules"
msgstr ""
#: transport.c:1345 transport-helper.c:657
msgid "operation not supported by protocol"
msgstr ""
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr ""
#: transport-helper.c:144
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr ""
#: transport-helper.c:160 transport-helper.c:571
msgid "can't dup helper output fd"
msgstr ""
#: transport-helper.c:211
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
#: transport-helper.c:217
msgid "this remote helper should implement refspec capability"
msgstr ""
#: transport-helper.c:284 transport-helper.c:425
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
#: transport-helper.c:414
#, c-format
msgid "%s also locked %s"
msgstr ""
#: transport-helper.c:493
msgid "couldn't run fast-import"
msgstr ""
#: transport-helper.c:516
msgid "error while running fast-import"
msgstr ""
#: transport-helper.c:545 transport-helper.c:1134
#, c-format
msgid "could not read ref %s"
msgstr ""
#: transport-helper.c:590
#, c-format
msgid "unknown response to connect: %s"
msgstr ""
#: transport-helper.c:612
msgid "setting remote service path not supported by protocol"
msgstr ""
#: transport-helper.c:614
msgid "invalid remote service path"
msgstr ""
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
#: transport-helper.c:736
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
#: transport-helper.c:789
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
#: transport-helper.c:850
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
#: transport-helper.c:853
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
#: transport-helper.c:856
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
#: transport-helper.c:861
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
#: transport-helper.c:867
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
#: transport-helper.c:965
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
#: transport-helper.c:970
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
#: transport-helper.c:1017
msgid "couldn't run fast-export"
msgstr ""
#: transport-helper.c:1022
msgid "error while running fast-export"
msgstr ""
#: transport-helper.c:1047
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
#: transport-helper.c:1120
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
#: transport-helper.c:1272
#, c-format
msgid "read(%s) failed"
msgstr ""
#: transport-helper.c:1299
#, c-format
msgid "write(%s) failed"
msgstr ""
#: transport-helper.c:1348
#, c-format
msgid "%s thread failed"
msgstr ""
#: transport-helper.c:1352
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
#: transport-helper.c:1371 transport-helper.c:1375
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
#: transport-helper.c:1412
#, c-format
msgid "%s process failed to wait"
msgstr ""
#: transport-helper.c:1416
#, c-format
msgid "%s process failed"
msgstr ""
#: transport-helper.c:1434 transport-helper.c:1443
msgid "can't start thread for copying data"
msgstr ""
#: tree-walk.c:32
msgid "too-short tree object"
msgstr ""
#: tree-walk.c:38
msgid "malformed mode in tree entry"
msgstr ""
#: tree-walk.c:42
msgid "empty filename in tree entry"
msgstr ""
#: tree-walk.c:117
msgid "too-short tree file"
msgstr ""
#: unpack-trees.c:110
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
#: unpack-trees.c:127
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
#: unpack-trees.c:131
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
#: unpack-trees.c:169
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
#: unpack-trees.c:174
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
#: unpack-trees.c:176
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
#: unpack-trees.c:178
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
#: unpack-trees.c:255
#, c-format
msgid "Aborting\n"
msgstr ""
#: unpack-trees.c:317
msgid "Updating files"
msgstr ""
#: unpack-trees.c:349
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
#: unpack-trees.c:1445
msgid "Updating index flags"
msgstr ""
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr ""
#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr ""
#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr ""
#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr ""
#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr ""
#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr ""
#: walker.c:170
msgid "Fetching objects"
msgstr ""
#: worktree.c:259 builtin/am.c:2099
#, c-format
msgid "failed to read '%s'"
msgstr ""
#: worktree.c:305
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
#: worktree.c:316
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
#: worktree.c:328
#, c-format
msgid "'%s' does not exist"
msgstr ""
#: worktree.c:334
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
#: wrapper.c:186 wrapper.c:356
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
#: wrapper.c:387 wrapper.c:588
#, c-format
msgid "unable to access '%s'"
msgstr ""
#: wrapper.c:596
msgid "unable to get current working directory"
msgstr ""
#: wt-status.c:158
msgid "Unmerged paths:"
msgstr ""
#: wt-status.c:187 wt-status.c:219
msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr ""
#: wt-status.c:190 wt-status.c:222
#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr ""
#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr ""
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
#: wt-status.c:241
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
#: wt-status.c:268
msgid "both deleted:"
msgstr ""
#: wt-status.c:270
msgid "added by us:"
msgstr ""
#: wt-status.c:272
msgid "deleted by them:"
msgstr ""
#: wt-status.c:274
msgid "added by them:"
msgstr ""
#: wt-status.c:276
msgid "deleted by us:"
msgstr ""
#: wt-status.c:278
msgid "both added:"
msgstr ""
#: wt-status.c:280
msgid "both modified:"
msgstr ""
#: wt-status.c:290
msgid "new file:"
msgstr ""
#: wt-status.c:292
msgid "copied:"
msgstr ""
#: wt-status.c:294
msgid "deleted:"
msgstr ""
#: wt-status.c:296
msgid "modified:"
msgstr ""
#: wt-status.c:298
msgid "renamed:"
msgstr ""
#: wt-status.c:300
msgid "typechange:"
msgstr ""
#: wt-status.c:302
msgid "unknown:"
msgstr ""
#: wt-status.c:304
msgid "unmerged:"
msgstr ""
#: wt-status.c:384
msgid "new commits, "
msgstr ""
#: wt-status.c:386
msgid "modified content, "
msgstr ""
#: wt-status.c:388
msgid "untracked content, "
msgstr ""
#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr ""
#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr ""
#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
#: wt-status.c:1114
#, c-format
msgid ""
"\n"
"It took %.2f seconds to compute the branch ahead/behind values.\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr ""
#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr ""
#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr ""
#: wt-status.c:1168
msgid "The current patch is empty."
msgstr ""
#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr ""
#: wt-status.c:1311
msgid "No commands done."
msgstr ""
#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr ""
#: wt-status.c:1330
msgid "No commands remaining."
msgstr ""
#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr ""
#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr ""
#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr ""
#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
#: wt-status.c:1437
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:1439
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
#: wt-status.c:1449
msgid "Revert currently in progress."
msgstr ""
#: wt-status.c:1452
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
#: wt-status.c:1458
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
#: wt-status.c:1461
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
#: wt-status.c:1464
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
#: wt-status.c:1466
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr ""
#: wt-status.c:1468
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
#: wt-status.c:1478
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
#: wt-status.c:1482
msgid "You are currently bisecting."
msgstr ""
#: wt-status.c:1485
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
#: wt-status.c:1694
msgid "On branch "
msgstr ""
#: wt-status.c:1701
msgid "interactive rebase in progress; onto "
msgstr ""
#: wt-status.c:1703
msgid "rebase in progress; onto "
msgstr ""
#: wt-status.c:1713
msgid "Not currently on any branch."
msgstr ""
#: wt-status.c:1730
msgid "Initial commit"
msgstr ""
#: wt-status.c:1731
msgid "No commits yet"
msgstr ""
#: wt-status.c:1745
msgid "Untracked files"
msgstr ""
#: wt-status.c:1747
msgid "Ignored files"
msgstr ""
#: wt-status.c:1751
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
#: wt-status.c:1757
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
#: wt-status.c:1759
msgid " (use -u option to show untracked files)"
msgstr ""
#: wt-status.c:1765
msgid "No changes"
msgstr ""
#: wt-status.c:1770
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
#: wt-status.c:1773
#, c-format
msgid "no changes added to commit\n"
msgstr ""
#: wt-status.c:1776
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
#: wt-status.c:1779
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
#: wt-status.c:1782
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
#: wt-status.c:1785 wt-status.c:1790
#, c-format
msgid "nothing to commit\n"
msgstr ""
#: wt-status.c:1788
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
#: wt-status.c:1792
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
#: wt-status.c:1905
msgid "No commits yet on "
msgstr ""
#: wt-status.c:1909
msgid "HEAD (no branch)"
msgstr ""
#: wt-status.c:1940
msgid "different"
msgstr ""
#: wt-status.c:1942 wt-status.c:1950
msgid "behind "
msgstr ""
#: wt-status.c:1945 wt-status.c:1948
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
#: wt-status.c:2470
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
#: wt-status.c:2476
msgid "additionally, your index contains uncommitted changes."
msgstr ""
#: wt-status.c:2478
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
#: compat/precompose_utf8.c:58 builtin/clone.c:455
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
#: builtin/add.c:88
#, c-format
msgid "unexpected diff status %c"
msgstr ""
#: builtin/add.c:93 builtin/commit.c:288
msgid "updating files failed"
msgstr ""
#: builtin/add.c:103
#, c-format
msgid "remove '%s'\n"
msgstr ""
#: builtin/add.c:178
msgid "Unstaged changes after refreshing the index:"
msgstr ""
#: builtin/add.c:266 builtin/rev-parse.c:899
msgid "Could not read the index"
msgstr ""
#: builtin/add.c:277
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
#: builtin/add.c:281
msgid "Could not write patch"
msgstr ""
#: builtin/add.c:284
msgid "editing patch failed"
msgstr ""
#: builtin/add.c:287
#, c-format
msgid "Could not stat '%s'"
msgstr ""
#: builtin/add.c:289
msgid "Empty patch. Aborted."
msgstr ""
#: builtin/add.c:294
#, c-format
msgid "Could not apply '%s'"
msgstr ""
#: builtin/add.c:302
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
#: builtin/add.c:325
msgid "interactive picking"
msgstr ""
#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
msgid "select hunks interactively"
msgstr ""
#: builtin/add.c:327
msgid "edit current diff and apply"
msgstr ""
#: builtin/add.c:328
msgid "allow adding otherwise ignored files"
msgstr ""
#: builtin/add.c:329
msgid "update tracked files"
msgstr ""
#: builtin/add.c:330
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
#: builtin/add.c:331
msgid "record only the fact that the path will be added later"
msgstr ""
#: builtin/add.c:332
msgid "add changes from all tracked and untracked files"
msgstr ""
#: builtin/add.c:335
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
#: builtin/add.c:337
msgid "don't add, only refresh the index"
msgstr ""
#: builtin/add.c:338
msgid "just skip files which cannot be added because of errors"
msgstr ""
#: builtin/add.c:339
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
#: builtin/add.c:341 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr ""
#: builtin/add.c:343
msgid "warn when adding an embedded repository"
msgstr ""
#: builtin/add.c:345
msgid "backend for `git stash -p`"
msgstr ""
#: builtin/add.c:363
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"Clones of the outer repository will not contain the contents of\n"
"the embedded repository and will not know how to obtain it.\n"
"If you meant to add a submodule, use:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"If you added this path by mistake, you can remove it from the\n"
"index with:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"See \"git help submodule\" for more information."
msgstr ""
#: builtin/add.c:391
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
#: builtin/add.c:410
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"\"git config advice.addIgnoredFile false\""
msgstr ""
#: builtin/add.c:419
msgid "adding files failed"
msgstr ""
#: builtin/add.c:447 builtin/commit.c:348
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
#: builtin/add.c:464
msgid "--pathspec-from-file is incompatible with --edit"
msgstr ""
#: builtin/add.c:476
msgid "-A and -u are mutually incompatible"
msgstr ""
#: builtin/add.c:479
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
#: builtin/add.c:483
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
#: builtin/add.c:512
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
#: builtin/add.c:514
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"\"git config advice.addEmptyPathspec false\""
msgstr ""
#: builtin/am.c:352
msgid "could not parse author script"
msgstr ""
#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
#: builtin/am.c:542
msgid "fseek failed"
msgstr ""
#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
#: builtin/am.c:795
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
#: builtin/am.c:843
msgid "invalid timestamp"
msgstr ""
#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr ""
#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr ""
#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr ""
#: builtin/am.c:953 builtin/clone.c:409
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
#: builtin/am.c:958
msgid "Failed to split patches."
msgstr ""
#: builtin/am.c:1089
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
#: builtin/am.c:1090
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
#: builtin/am.c:1091
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
#: builtin/am.c:1174
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
#: builtin/am.c:1202
msgid "Patch is empty."
msgstr ""
#: builtin/am.c:1267
#, c-format
msgid "missing author line in commit %s"
msgstr ""
#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
#: builtin/am.c:1489
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
#: builtin/am.c:1491
msgid "Using index info to reconstruct a base tree..."
msgstr ""
#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr ""
#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr ""
#: builtin/am.c:1621 builtin/am.c:1625
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
#: builtin/am.c:1643
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
#: builtin/am.c:1653
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
#: builtin/am.c:1700 builtin/commit.c:398
msgid "unable to write index file"
msgstr ""
#: builtin/am.c:1704
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
#: builtin/am.c:1744 builtin/am.c:1812
#, c-format
msgid "Applying: %.*s"
msgstr ""
#: builtin/am.c:1761
msgid "No changes -- Patch already applied."
msgstr ""
#: builtin/am.c:1767
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
#: builtin/am.c:1771
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
#: builtin/am.c:1815
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
#: builtin/am.c:1822
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
#: builtin/reset.c:354
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
#: builtin/am.c:1981
msgid "failed to clean index"
msgstr ""
#: builtin/am.c:2025
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
#: builtin/am.c:2132
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
#: builtin/am.c:2172
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
#: builtin/am.c:2176
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
#: builtin/am.c:2207
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
#: builtin/am.c:2208
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
#: builtin/am.c:2214
msgid "run interactively"
msgstr ""
#: builtin/am.c:2216
msgid "historical option -- no-op"
msgstr ""
#: builtin/am.c:2218
msgid "allow fall back on 3way merging if needed"
msgstr ""
#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
#: builtin/repack.c:304 builtin/stash.c:812
msgid "be quiet"
msgstr ""
#: builtin/am.c:2221
msgid "add a Signed-off-by line to the commit message"
msgstr ""
#: builtin/am.c:2224
msgid "recode into utf8 (default)"
msgstr ""
#: builtin/am.c:2226
msgid "pass -k flag to git-mailinfo"
msgstr ""
#: builtin/am.c:2228
msgid "pass -b flag to git-mailinfo"
msgstr ""
#: builtin/am.c:2230
msgid "pass -m flag to git-mailinfo"
msgstr ""
#: builtin/am.c:2232
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
#: builtin/am.c:2235
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
#: builtin/am.c:2238
msgid "strip everything before a scissors line"
msgstr ""
#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
#: builtin/am.c:2267
msgid "pass it through git-apply"
msgstr ""
#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
#: parse-options.h:154 parse-options.h:175 parse-options.h:316
msgid "n"
msgstr ""
#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr ""
#: builtin/am.c:2264
msgid "format the patch(es) are in"
msgstr ""
#: builtin/am.c:2270
msgid "override error message when patch failure occurs"
msgstr ""
#: builtin/am.c:2272
msgid "continue applying patches after resolving a conflict"
msgstr ""
#: builtin/am.c:2275
msgid "synonyms for --continue"
msgstr ""
#: builtin/am.c:2278
msgid "skip the current patch"
msgstr ""
#: builtin/am.c:2281
msgid "restore the original branch and abort the patching operation."
msgstr ""
#: builtin/am.c:2284
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
#: builtin/am.c:2288
msgid "show the patch being applied"
msgstr ""
#: builtin/am.c:2293
msgid "lie about committer date"
msgstr ""
#: builtin/am.c:2295
msgid "use current timestamp for author date"
msgstr ""
#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr ""
#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
msgid "GPG-sign commits"
msgstr ""
#: builtin/am.c:2301
msgid "(internal use for git-rebase)"
msgstr ""
#: builtin/am.c:2319
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
#: builtin/am.c:2326
msgid "failed to read the index"
msgstr ""
#: builtin/am.c:2341
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
#: builtin/am.c:2365
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
#: builtin/am.c:2371
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
#: builtin/am.c:2381
msgid "interactive mode requires patches on the command line"
msgstr ""
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr ""
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr ""
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr ""
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr ""
#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr ""
#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr ""
#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr ""
#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr ""
#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
msgstr ""
#: builtin/bisect--helper.c:27
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr ""
#: builtin/bisect--helper.c:28
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
#: builtin/bisect--helper.c:29
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
msgstr ""
#: builtin/bisect--helper.c:30
msgid ""
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr ""
#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr ""
#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr ""
#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr ""
#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr ""
#: builtin/bisect--helper.c:155
#, c-format
msgid "We are not bisecting.\n"
msgstr ""
#: builtin/bisect--helper.c:163
#, c-format
msgid "'%s' is not a valid commit"
msgstr ""
#: builtin/bisect--helper.c:172
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
#: builtin/bisect--helper.c:216
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr ""
#: builtin/bisect--helper.c:221
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr ""
#: builtin/bisect--helper.c:233
#, c-format
msgid "couldn't open the file '%s'"
msgstr ""
#: builtin/bisect--helper.c:259
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
#: builtin/bisect--helper.c:286
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
#: builtin/bisect--helper.c:290
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
#: builtin/bisect--helper.c:310
#, c-format
msgid "bisecting only with a %s commit"
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
#: builtin/bisect--helper.c:318
msgid "Are you sure [Y/n]? "
msgstr ""
#: builtin/bisect--helper.c:379
msgid "no terms defined"
msgstr ""
#: builtin/bisect--helper.c:382
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
#: builtin/bisect--helper.c:392
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
#: builtin/bisect--helper.c:478
#, c-format
msgid "unrecognized option: '%s'"
msgstr ""
#: builtin/bisect--helper.c:482
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr ""
#: builtin/bisect--helper.c:514
msgid "bad HEAD - I need a HEAD"
msgstr ""
#: builtin/bisect--helper.c:529
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
#: builtin/bisect--helper.c:550
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
#: builtin/bisect--helper.c:553
msgid "bad HEAD - strange symbolic ref"
msgstr ""
#: builtin/bisect--helper.c:577
#, c-format
msgid "invalid ref: '%s'"
msgstr ""
#: builtin/bisect--helper.c:633
msgid "perform 'git bisect next'"
msgstr ""
#: builtin/bisect--helper.c:635
msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
#: builtin/bisect--helper.c:637
msgid "cleanup the bisection state"
msgstr ""
#: builtin/bisect--helper.c:639
msgid "check for expected revs"
msgstr ""
#: builtin/bisect--helper.c:641
msgid "reset the bisection state"
msgstr ""
#: builtin/bisect--helper.c:643
msgid "write out the bisection state in BISECT_LOG"
msgstr ""
#: builtin/bisect--helper.c:645
msgid "check and set terms in a bisection state"
msgstr ""
#: builtin/bisect--helper.c:647
msgid "check whether bad or good terms exist"
msgstr ""
#: builtin/bisect--helper.c:649
msgid "print out the bisect terms"
msgstr ""
#: builtin/bisect--helper.c:651
msgid "start the bisect session"
msgstr ""
#: builtin/bisect--helper.c:653
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
#: builtin/bisect--helper.c:655
msgid "no log for BISECT_WRITE"
msgstr ""
#: builtin/bisect--helper.c:673
msgid "--write-terms requires two arguments"
msgstr ""
#: builtin/bisect--helper.c:677
msgid "--bisect-clean-state requires no arguments"
msgstr ""
#: builtin/bisect--helper.c:684
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
#: builtin/bisect--helper.c:688
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
#: builtin/bisect--helper.c:694
msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
#: builtin/bisect--helper.c:700
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
#: builtin/bisect--helper.c:706
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
#: builtin/blame.c:31
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
#: builtin/blame.c:36
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
#: builtin/blame.c:409
#, c-format
msgid "expecting a color: %s"
msgstr ""
#: builtin/blame.c:416
msgid "must end with a color"
msgstr ""
#: builtin/blame.c:729
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
#: builtin/blame.c:747
msgid "invalid value for blame.coloring"
msgstr ""
#: builtin/blame.c:822
#, c-format
msgid "cannot find revision %s to ignore"
msgstr ""
#: builtin/blame.c:844
msgid "Show blame entries as we find them, incrementally"
msgstr ""
#: builtin/blame.c:845
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
#: builtin/blame.c:846
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
#: builtin/blame.c:847
msgid "Show work cost statistics"
msgstr ""
#: builtin/blame.c:848
msgid "Force progress reporting"
msgstr ""
#: builtin/blame.c:849
msgid "Show output score for blame entries"
msgstr ""
#: builtin/blame.c:850
msgid "Show original filename (Default: auto)"
msgstr ""
#: builtin/blame.c:851
msgid "Show original linenumber (Default: off)"
msgstr ""
#: builtin/blame.c:852
msgid "Show in a format designed for machine consumption"
msgstr ""
#: builtin/blame.c:853
msgid "Show porcelain format with per-line commit information"
msgstr ""
#: builtin/blame.c:854
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
#: builtin/blame.c:855
msgid "Show raw timestamp (Default: off)"
msgstr ""
#: builtin/blame.c:856
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
#: builtin/blame.c:857
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
#: builtin/blame.c:858
msgid "Show author email instead of name (Default: off)"
msgstr ""
#: builtin/blame.c:859
msgid "Ignore whitespace differences"
msgstr ""
#: builtin/blame.c:860 builtin/log.c:1702
msgid "rev"
msgstr ""
#: builtin/blame.c:860
msgid "Ignore <rev> when blaming"
msgstr ""
#: builtin/blame.c:861
msgid "Ignore revisions from <file>"
msgstr ""
#: builtin/blame.c:862
msgid "color redundant metadata from previous line differently"
msgstr ""
#: builtin/blame.c:863
msgid "color lines by age"
msgstr ""
#: builtin/blame.c:864
msgid "Spend extra cycles to find better match"
msgstr ""
#: builtin/blame.c:865
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
#: builtin/blame.c:866
msgid "Use <file>'s contents as the final image"
msgstr ""
#: builtin/blame.c:867 builtin/blame.c:868
msgid "score"
msgstr ""
#: builtin/blame.c:867
msgid "Find line copies within and across files"
msgstr ""
#: builtin/blame.c:868
msgid "Find line movements within and across files"
msgstr ""
#: builtin/blame.c:869
msgid "n,m"
msgstr ""
#: builtin/blame.c:869
msgid "Process only line range n,m, counting from 1"
msgstr ""
#: builtin/blame.c:921
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. TRANSLATORS: This string is used to tell us the
#. maximum display width for a relative timestamp in
#. "git blame" output. For C locale, "4 years, 11
#. months ago", which takes 22 places, is the longest
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
#.
#: builtin/blame.c:972
msgid "4 years, 11 months ago"
msgstr ""
#: builtin/blame.c:1079
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
#: builtin/blame.c:1125
msgid "Blaming lines"
msgstr ""
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr ""
#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr ""
#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr ""
#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr ""
#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr ""
#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr ""
#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr ""
#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr ""
#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
#: builtin/branch.c:618
msgid "Generic options"
msgstr ""
#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr ""
#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
#: builtin/branch.c:624
msgid "do not use"
msgstr ""
#: builtin/branch.c:626 builtin/rebase.c:513
msgid "upstream"
msgstr ""
#: builtin/branch.c:626
msgid "change the upstream info"
msgstr ""
#: builtin/branch.c:627
msgid "unset the upstream info"
msgstr ""
#: builtin/branch.c:628
msgid "use colored output"
msgstr ""
#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr ""
#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr ""
#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr ""
#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr ""
#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr ""
#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr ""
#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr ""
#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr ""
#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr ""
#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr ""
#: builtin/branch.c:646
msgid "list branch names"
msgstr ""
#: builtin/branch.c:647
msgid "show current branch name"
msgstr ""
#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr ""
#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr ""
#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr ""
#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr ""
#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr ""
#: builtin/branch.c:654
msgid "list branches in columns"
msgstr ""
#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
#: builtin/tag.c:433
msgid "object"
msgstr ""
#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr ""
#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr ""
#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
#: builtin/branch.c:684 builtin/clone.c:785
msgid "HEAD not found below refs/heads!"
msgstr ""
#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr ""
#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr ""
#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr ""
#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr ""
#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr ""
#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr ""
#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr ""
#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr ""
#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr ""
#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
#: builtin/branch.c:841
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
#: builtin/bundle.c:15 builtin/bundle.c:23
msgid "git bundle create [<options>] <file> <git-rev-list args>"
msgstr ""
#: builtin/bundle.c:16 builtin/bundle.c:28
msgid "git bundle verify [<options>] <file>"
msgstr ""
#: builtin/bundle.c:17 builtin/bundle.c:33
msgid "git bundle list-heads <file> [<refname>...]"
msgstr ""
#: builtin/bundle.c:18 builtin/bundle.c:38
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
#: builtin/bundle.c:66 builtin/pack-objects.c:3375
msgid "do not show progress meter"
msgstr ""
#: builtin/bundle.c:68 builtin/pack-objects.c:3377
msgid "show progress meter"
msgstr ""
#: builtin/bundle.c:70 builtin/pack-objects.c:3379
msgid "show progress meter during object writing phase"
msgstr ""
#: builtin/bundle.c:73 builtin/pack-objects.c:3382
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
#: builtin/bundle.c:93
msgid "Need a repository to create a bundle."
msgstr ""
#: builtin/bundle.c:104
msgid "do not show bundle details"
msgstr ""
#: builtin/bundle.c:119
#, c-format
msgid "%s is okay\n"
msgstr ""
#: builtin/bundle.c:160
msgid "Need a repository to unbundle."
msgstr ""
#: builtin/bundle.c:168 builtin/remote.c:1686
msgid "be verbose; must be placed before a subcommand"
msgstr ""
#: builtin/bundle.c:190 builtin/remote.c:1717
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
#: builtin/cat-file.c:595
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
#: builtin/cat-file.c:596
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
#: builtin/cat-file.c:617
msgid "only one batch option may be specified"
msgstr ""
#: builtin/cat-file.c:635
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
#: builtin/cat-file.c:636
msgid "show object type"
msgstr ""
#: builtin/cat-file.c:637
msgid "show object size"
msgstr ""
#: builtin/cat-file.c:639
msgid "exit with zero when there's no error"
msgstr ""
#: builtin/cat-file.c:640
msgid "pretty-print object's content"
msgstr ""
#: builtin/cat-file.c:642
msgid "for blob objects, run textconv on object's content"
msgstr ""
#: builtin/cat-file.c:644
msgid "for blob objects, run filters on object's content"
msgstr ""
#: builtin/cat-file.c:645 git-submodule.sh:1002
msgid "blob"
msgstr ""
#: builtin/cat-file.c:646
msgid "use a specific path for --textconv/--filters"
msgstr ""
#: builtin/cat-file.c:648
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
#: builtin/cat-file.c:649
msgid "buffer --batch output"
msgstr ""
#: builtin/cat-file.c:651
msgid "show info and content of objects fed from the standard input"
msgstr ""
#: builtin/cat-file.c:655
msgid "show info about objects fed from the standard input"
msgstr ""
#: builtin/cat-file.c:659
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
#: builtin/cat-file.c:661
msgid "show all objects with --batch or --batch-check"
msgstr ""
#: builtin/cat-file.c:663
msgid "do not order --batch-all-objects output"
msgstr ""
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr ""
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr ""
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr ""
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr ""
#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
#: builtin/worktree.c:499
msgid "suppress progress reporting"
msgstr ""
#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr ""
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr ""
#: builtin/check-ignore.c:163
msgid "cannot specify pathnames with --stdin"
msgstr ""
#: builtin/check-ignore.c:166
msgid "-z only makes sense with --stdin"
msgstr ""
#: builtin/check-ignore.c:168
msgid "no path specified"
msgstr ""
#: builtin/check-ignore.c:172
msgid "--quiet is only valid with a single pathname"
msgstr ""
#: builtin/check-ignore.c:174
msgid "cannot have both --quiet and --verbose"
msgstr ""
#: builtin/check-ignore.c:177
msgid "--non-matching is only valid with --verbose"
msgstr ""
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr ""
#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr ""
#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr ""
#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr ""
#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr ""
#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr ""
#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr ""
#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr ""
#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr ""
#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr ""
#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr ""
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
#: builtin/worktree.c:672
msgid "string"
msgstr ""
#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr ""
#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr ""
#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr ""
#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
#: builtin/checkout.c:37
msgid "git switch [<options>] [<branch>]"
msgstr ""
#: builtin/checkout.c:42
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
#: builtin/checkout.c:175 builtin/checkout.c:214
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
#: builtin/checkout.c:177 builtin/checkout.c:216
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
#: builtin/checkout.c:193
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
#: builtin/checkout.c:243
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
#: builtin/checkout.c:261
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
#: builtin/checkout.c:277
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
#: builtin/checkout.c:377
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:382
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:389
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
#: builtin/checkout.c:422
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
#: builtin/checkout.c:425 builtin/checkout.c:428
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
#: builtin/checkout.c:432
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
#: builtin/checkout.c:436
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
#: builtin/checkout.c:440
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
#: builtin/checkout.c:445 builtin/checkout.c:450
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
#: builtin/checkout.c:509 builtin/checkout.c:516
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
msgid "you need to resolve your current index first"
msgstr ""
#: builtin/checkout.c:734
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
#: builtin/checkout.c:837
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
#: builtin/checkout.c:879
msgid "HEAD is now at"
msgstr ""
#: builtin/checkout.c:883 builtin/clone.c:717
msgid "unable to update HEAD"
msgstr ""
#: builtin/checkout.c:887
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
#: builtin/checkout.c:890
#, c-format
msgid "Already on '%s'\n"
msgstr ""
#: builtin/checkout.c:894
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
#: builtin/checkout.c:896 builtin/checkout.c:1320
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
#: builtin/checkout.c:898
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
#: builtin/checkout.c:949
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#: builtin/checkout.c:955
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:974
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
msgstr[1] ""
#: builtin/checkout.c:1009
msgid "internal error in revision walk"
msgstr ""
#: builtin/checkout.c:1013
msgid "Previous HEAD position was"
msgstr ""
#: builtin/checkout.c:1053 builtin/checkout.c:1315
msgid "You are on a branch yet to be born"
msgstr ""
#: builtin/checkout.c:1128
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
#: builtin/checkout.c:1135
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
#: builtin/checkout.c:1145
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
#: builtin/checkout.c:1211
msgid "only one reference expected"
msgstr ""
#: builtin/checkout.c:1228
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
#, c-format
msgid "invalid reference: %s"
msgstr ""
#: builtin/checkout.c:1287 builtin/checkout.c:1649
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
#: builtin/checkout.c:1334
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
#: builtin/checkout.c:1336
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
#: builtin/checkout.c:1337 builtin/checkout.c:1345
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
#: builtin/checkout.c:1340
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
#: builtin/checkout.c:1356
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1360
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1364
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1368
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1372
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
#: builtin/checkout.c:1376
msgid "you are switching branch while bisecting"
msgstr ""
#: builtin/checkout.c:1383
msgid "paths cannot be used with switching branches"
msgstr ""
#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
#: builtin/checkout.c:1409 builtin/checkout.c:1414
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
#: builtin/checkout.c:1411
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
#: builtin/checkout.c:1419
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
#: builtin/checkout.c:1426
msgid "missing branch or commit argument"
msgstr ""
#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr ""
#: builtin/checkout.c:1469
msgid "perform a 3-way merge with the new branch"
msgstr ""
#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
msgid "style"
msgstr ""
#: builtin/checkout.c:1471
msgid "conflict style (merge or diff3)"
msgstr ""
#: builtin/checkout.c:1483 builtin/worktree.c:496
msgid "detach HEAD at named commit"
msgstr ""
#: builtin/checkout.c:1484
msgid "set upstream info for new branch"
msgstr ""
#: builtin/checkout.c:1486
msgid "force checkout (throw away local modifications)"
msgstr ""
#: builtin/checkout.c:1488
msgid "new-branch"
msgstr ""
#: builtin/checkout.c:1488
msgid "new unparented branch"
msgstr ""
#: builtin/checkout.c:1490 builtin/merge.c:289
msgid "update ignored files (default)"
msgstr ""
#: builtin/checkout.c:1493
msgid "do not check if another worktree is holding the given ref"
msgstr ""
#: builtin/checkout.c:1506
msgid "checkout our version for unmerged files"
msgstr ""
#: builtin/checkout.c:1509
msgid "checkout their version for unmerged files"
msgstr ""
#: builtin/checkout.c:1513
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
#: builtin/checkout.c:1565
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
#: builtin/checkout.c:1568
msgid "-p and --overlay are mutually exclusive"
msgstr ""
#: builtin/checkout.c:1605
msgid "--track needs a branch name"
msgstr ""
#: builtin/checkout.c:1610
msgid "missing branch name; try -b"
msgstr ""
#: builtin/checkout.c:1642
#, c-format
msgid "could not resolve %s"
msgstr ""
#: builtin/checkout.c:1658
msgid "invalid path specification"
msgstr ""
#: builtin/checkout.c:1665
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
#: builtin/checkout.c:1669
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
#: builtin/checkout.c:1678
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
#: builtin/checkout.c:1692
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
#: builtin/checkout.c:1697
msgid "you must specify path(s) to restore"
msgstr ""
#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
msgid "branch"
msgstr ""
#: builtin/checkout.c:1724
msgid "create and checkout a new branch"
msgstr ""
#: builtin/checkout.c:1726
msgid "create/reset and checkout a branch"
msgstr ""
#: builtin/checkout.c:1727
msgid "create reflog for new branch"
msgstr ""
#: builtin/checkout.c:1729
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
#: builtin/checkout.c:1730
msgid "use overlay mode (default)"
msgstr ""
#: builtin/checkout.c:1775
msgid "create and switch to a new branch"
msgstr ""
#: builtin/checkout.c:1777
msgid "create/reset and switch to a branch"
msgstr ""
#: builtin/checkout.c:1779
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
#: builtin/checkout.c:1781
msgid "throw away local modifications"
msgstr ""
#: builtin/checkout.c:1813
msgid "which tree-ish to checkout from"
msgstr ""
#: builtin/checkout.c:1815
msgid "restore the index"
msgstr ""
#: builtin/checkout.c:1817
msgid "restore the working tree (default)"
msgstr ""
#: builtin/checkout.c:1819
msgid "ignore unmerged entries"
msgstr ""
#: builtin/checkout.c:1820
msgid "use overlay mode"
msgstr ""
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr ""
#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr ""
#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr ""
#: builtin/clean.c:37
#, c-format
msgid "could not lstat %s\n"
msgstr ""
#: builtin/clean.c:301 git-add--interactive.perl:595
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - select item based on unique prefix\n"
" - (empty) select nothing\n"
msgstr ""
#: builtin/clean.c:305 git-add--interactive.perl:604
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
"3-5 - select a range of items\n"
"2-3,6-9 - select multiple ranges\n"
"foo - select item based on unique prefix\n"
"-... - unselect specified items\n"
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
#: builtin/clean.c:521 git-add--interactive.perl:570
#: git-add--interactive.perl:575
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
#: builtin/clean.c:721
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"select by numbers - select items to be deleted by numbers\n"
"ask each - confirm each deletion (like \"rm -i\")\n"
"quit - stop cleaning\n"
"help - this screen\n"
"? - help for prompt selection"
msgstr ""
#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr ""
#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr ""
#: builtin/clean.c:911
msgid "force"
msgstr ""
#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr ""
#: builtin/clean.c:914
msgid "remove whole directories"
msgstr ""
#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr ""
#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr ""
#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr ""
#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr ""
#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr ""
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr ""
#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr ""
#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr ""
#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr ""
#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr ""
#: builtin/clone.c:107
msgid "pathspec"
msgstr ""
#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr ""
#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr ""
#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr ""
#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr ""
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
#: builtin/submodule--helper.c:1912
msgid "reference repository"
msgstr ""
#: builtin/clone.c:118 builtin/submodule--helper.c:1409
#: builtin/submodule--helper.c:1914
msgid "use --reference only while cloning"
msgstr ""
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
#: builtin/pack-objects.c:3441 builtin/repack.c:327
msgid "name"
msgstr ""
#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr ""
#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
#: builtin/pull.c:207
msgid "depth"
msgstr ""
#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
msgid "time"
msgstr ""
#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr ""
#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
#: builtin/rebase.c:1480
msgid "revision"
msgstr ""
#: builtin/clone.c:130 builtin/fetch.c:173
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
#: builtin/clone.c:132 builtin/submodule--helper.c:1419
#: builtin/submodule--helper.c:1928
msgid "clone only one branch, HEAD or --branch"
msgstr ""
#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr ""
#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr ""
#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr ""
#: builtin/clone.c:139
msgid "key=value"
msgstr ""
#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr ""
#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
#: builtin/push.c:573 builtin/send-pack.c:172
msgid "server-specific"
msgstr ""
#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
#: builtin/push.c:573 builtin/send-pack.c:173
msgid "option to transmit"
msgstr ""
#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
#: builtin/push.c:574
msgid "use IPv4 addresses only"
msgstr ""
#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
#: builtin/push.c:576
msgid "use IPv6 addresses only"
msgstr ""
#: builtin/clone.c:149
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
#: builtin/clone.c:151
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
#: builtin/clone.c:287
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
#: builtin/clone.c:340
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
#: builtin/clone.c:413
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
#: builtin/clone.c:430
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
#: builtin/clone.c:460
#, c-format
msgid "failed to create link '%s'"
msgstr ""
#: builtin/clone.c:464
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
#: builtin/clone.c:469
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
#: builtin/clone.c:494
#, c-format
msgid "done.\n"
msgstr ""
#: builtin/clone.c:508
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
#: builtin/clone.c:585
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
#: builtin/clone.c:705
#, c-format
msgid "unable to update %s"
msgstr ""
#: builtin/clone.c:753
msgid "failed to initialize sparse-checkout"
msgstr ""
#: builtin/clone.c:776
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
#: builtin/clone.c:807
msgid "unable to checkout working tree"
msgstr ""
#: builtin/clone.c:862
msgid "unable to write parameters to config file"
msgstr ""
#: builtin/clone.c:925
msgid "cannot repack to clean up"
msgstr ""
#: builtin/clone.c:927
msgid "cannot unlink temporary alternates file"
msgstr ""
#: builtin/clone.c:965 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr ""
#: builtin/clone.c:969
msgid "You must specify a repository to clone."
msgstr ""
#: builtin/clone.c:982
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
#: builtin/clone.c:985
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
#: builtin/clone.c:998
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
#: builtin/clone.c:1004 builtin/fetch.c:1796
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
#: builtin/clone.c:1014
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
#: builtin/clone.c:1024
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
#: builtin/clone.c:1044
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
#: builtin/clone.c:1064
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
#: builtin/clone.c:1066
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
#: builtin/clone.c:1090
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
#: builtin/clone.c:1154
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
#: builtin/clone.c:1156
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
#: builtin/clone.c:1158
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
#: builtin/clone.c:1160
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
#: builtin/clone.c:1163
msgid "source repository is shallow, ignoring --local"
msgstr ""
#: builtin/clone.c:1168
msgid "--local is ignored"
msgstr ""
#: builtin/clone.c:1243 builtin/clone.c:1251
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
#: builtin/clone.c:1254
msgid "You appear to have cloned an empty repository."
msgstr ""
#: builtin/column.c:10
msgid "git column [<options>]"
msgstr ""
#: builtin/column.c:27
msgid "lookup config vars"
msgstr ""
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr ""
#: builtin/column.c:30
msgid "Maximum width"
msgstr ""
#: builtin/column.c:31
msgid "Padding space on left border"
msgstr ""
#: builtin/column.c:32
msgid "Padding space on right border"
msgstr ""
#: builtin/column.c:33
msgid "Padding space between columns"
msgstr ""
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr ""
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
#: builtin/commit-tree.c:31
#, c-format
msgid "duplicate parent %s ignored"
msgstr ""
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
#, c-format
msgid "not a valid object name %s"
msgstr ""
#: builtin/commit-tree.c:93
#, c-format
msgid "git commit-tree: failed to open '%s'"
msgstr ""
#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr ""
#: builtin/commit-tree.c:98
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr ""
#: builtin/commit-tree.c:111
msgid "parent"
msgstr ""
#: builtin/commit-tree.c:112
msgid "id of a parent commit object"
msgstr ""
#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
#: builtin/tag.c:412
msgid "message"
msgstr ""
#: builtin/commit-tree.c:115 builtin/commit.c:1501
msgid "commit message"
msgstr ""
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
msgstr ""
#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
#: builtin/pull.c:175 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
#: builtin/commit-tree.c:133
msgid "must give exactly one tree"
msgstr ""
#: builtin/commit-tree.c:140
msgid "git commit-tree: failed to read"
msgstr ""
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:51
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
#: builtin/commit.c:56
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
" git commit --allow-empty\n"
"\n"
msgstr ""
#: builtin/commit.c:63
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
#: builtin/commit.c:66
msgid ""
"and then use:\n"
"\n"
" git cherry-pick --continue\n"
"\n"
"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
msgstr ""
#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr ""
#: builtin/commit.c:351
msgid "--pathspec-from-file with -a does not make sense"
msgstr ""
#: builtin/commit.c:364
msgid "No paths with --include/--only does not make sense."
msgstr ""
#: builtin/commit.c:376
msgid "unable to create temporary index"
msgstr ""
#: builtin/commit.c:385
msgid "interactive add failed"
msgstr ""
#: builtin/commit.c:400
msgid "unable to update temporary index"
msgstr ""
#: builtin/commit.c:402
msgid "Failed to update main cache tree"
msgstr ""
#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
msgid "unable to write new_index file"
msgstr ""
#: builtin/commit.c:479
msgid "cannot do a partial commit during a merge."
msgstr ""
#: builtin/commit.c:481
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
#: builtin/commit.c:489
msgid "cannot read the index"
msgstr ""
#: builtin/commit.c:508
msgid "unable to write temporary index file"
msgstr ""
#: builtin/commit.c:606
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
#: builtin/commit.c:608
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
#: builtin/commit.c:627
msgid "malformed --author parameter"
msgstr ""
#: builtin/commit.c:680
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
msgstr ""
#: builtin/commit.c:730 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
#: builtin/commit.c:732
msgid "could not read log from standard input"
msgstr ""
#: builtin/commit.c:736
#, c-format
msgid "could not read log file '%s'"
msgstr ""
#: builtin/commit.c:767 builtin/commit.c:783
msgid "could not read SQUASH_MSG"
msgstr ""
#: builtin/commit.c:774
msgid "could not read MERGE_MSG"
msgstr ""
#: builtin/commit.c:834
msgid "could not write commit template"
msgstr ""
#: builtin/commit.c:853
#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
#: builtin/commit.c:858
#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
#: builtin/commit.c:871
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
#: builtin/commit.c:879
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
#: builtin/commit.c:896
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
#: builtin/commit.c:904
#, c-format
msgid "%sDate: %s"
msgstr ""
#: builtin/commit.c:911
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
#: builtin/commit.c:929
msgid "Cannot read index"
msgstr ""
#: builtin/commit.c:997
msgid "Error building trees"
msgstr ""
#: builtin/commit.c:1011 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
#: builtin/commit.c:1069
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
#: builtin/commit.c:1087 builtin/commit.c:1327
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
#: builtin/commit.c:1127
msgid "--long and -z are incompatible"
msgstr ""
#: builtin/commit.c:1171
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
#: builtin/commit.c:1180
msgid "You have nothing to amend."
msgstr ""
#: builtin/commit.c:1183
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
#: builtin/commit.c:1185
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
#: builtin/commit.c:1188
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
#: builtin/commit.c:1198
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
#: builtin/commit.c:1200
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
#: builtin/commit.c:1208
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
#: builtin/commit.c:1225
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
#: builtin/commit.c:1231
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
#: builtin/commit.c:1362 builtin/commit.c:1524
msgid "show status concisely"
msgstr ""
#: builtin/commit.c:1364 builtin/commit.c:1526
msgid "show branch information"
msgstr ""
#: builtin/commit.c:1366
msgid "show stash information"
msgstr ""
#: builtin/commit.c:1368 builtin/commit.c:1528
msgid "compute full ahead/behind values"
msgstr ""
#: builtin/commit.c:1370
msgid "version"
msgstr ""
#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
#: builtin/worktree.c:643
msgid "machine-readable output"
msgstr ""
#: builtin/commit.c:1373 builtin/commit.c:1532
msgid "show status in long format (default)"
msgstr ""
#: builtin/commit.c:1376 builtin/commit.c:1535
msgid "terminate entries with NUL"
msgstr ""
#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
msgid "mode"
msgstr ""
#: builtin/commit.c:1379 builtin/commit.c:1538
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
#: builtin/commit.c:1383
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
#: builtin/commit.c:1385 parse-options.h:192
msgid "when"
msgstr ""
#: builtin/commit.c:1386
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
#: builtin/commit.c:1388
msgid "list untracked files in columns"
msgstr ""
#: builtin/commit.c:1389
msgid "do not detect renames"
msgstr ""
#: builtin/commit.c:1391
msgid "detect renames, optionally set similarity index"
msgstr ""
#: builtin/commit.c:1411
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
#: builtin/commit.c:1494
msgid "suppress summary after successful commit"
msgstr ""
#: builtin/commit.c:1495
msgid "show diff in commit message template"
msgstr ""
#: builtin/commit.c:1497
msgid "Commit message options"
msgstr ""
#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
msgid "read message from file"
msgstr ""
#: builtin/commit.c:1499
msgid "author"
msgstr ""
#: builtin/commit.c:1499
msgid "override author for commit"
msgstr ""
#: builtin/commit.c:1500 builtin/gc.c:538
msgid "date"
msgstr ""
#: builtin/commit.c:1500
msgid "override date for commit"
msgstr ""
#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr ""
#: builtin/commit.c:1502
msgid "reuse and edit message from specified commit"
msgstr ""
#: builtin/commit.c:1503
msgid "reuse message from specified commit"
msgstr ""
#: builtin/commit.c:1504
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
#: builtin/commit.c:1505
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
#: builtin/commit.c:1506
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
#: builtin/pull.c:144 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr ""
#: builtin/commit.c:1508
msgid "use specified template file"
msgstr ""
#: builtin/commit.c:1509
msgid "force edit of commit"
msgstr ""
#: builtin/commit.c:1511
msgid "include status in commit message template"
msgstr ""
#: builtin/commit.c:1516
msgid "Commit contents options"
msgstr ""
#: builtin/commit.c:1517
msgid "commit all changed files"
msgstr ""
#: builtin/commit.c:1518
msgid "add specified files to index for commit"
msgstr ""
#: builtin/commit.c:1519
msgid "interactively add files"
msgstr ""
#: builtin/commit.c:1520
msgid "interactively add changes"
msgstr ""
#: builtin/commit.c:1521
msgid "commit only specified files"
msgstr ""
#: builtin/commit.c:1522
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
#: builtin/commit.c:1523
msgid "show what would be committed"
msgstr ""
#: builtin/commit.c:1536
msgid "amend previous commit"
msgstr ""
#: builtin/commit.c:1537
msgid "bypass post-rewrite hook"
msgstr ""
#: builtin/commit.c:1544
msgid "ok to record an empty change"
msgstr ""
#: builtin/commit.c:1546
msgid "ok to record a change with an empty message"
msgstr ""
#: builtin/commit.c:1619
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
#: builtin/commit.c:1626
msgid "could not read MERGE_MODE"
msgstr ""
#: builtin/commit.c:1645
#, c-format
msgid "could not read commit message: %s"
msgstr ""
#: builtin/commit.c:1652
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
#: builtin/commit.c:1691
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
msgstr ""
#: builtin/commit-graph.c:52
#, c-format
msgid "could not find object directory matching %s"
msgstr ""
#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
msgid "dir"
msgstr ""
#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
#: builtin/commit-graph.c:211
msgid "The object directory to store the graph"
msgstr ""
#: builtin/commit-graph.c:71
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
#: builtin/commit-graph.c:128
msgid "start walk at all refs"
msgstr ""
#: builtin/commit-graph.c:130
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
#: builtin/commit-graph.c:132
msgid "start walk at commits listed by stdin"
msgstr ""
#: builtin/commit-graph.c:134
msgid "include all commits already in the commit-graph file"
msgstr ""
#: builtin/commit-graph.c:137
msgid "allow writing an incremental commit-graph file"
msgstr ""
#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
#: builtin/commit-graph.c:141
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
#: builtin/commit-graph.c:159
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr ""
#: builtin/config.c:104 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
#: builtin/config.c:116
msgid "only one type at a time"
msgstr ""
#: builtin/config.c:125
msgid "Config file location"
msgstr ""
#: builtin/config.c:126
msgid "use global config file"
msgstr ""
#: builtin/config.c:127
msgid "use system config file"
msgstr ""
#: builtin/config.c:128
msgid "use repository config file"
msgstr ""
#: builtin/config.c:129
msgid "use per-worktree config file"
msgstr ""
#: builtin/config.c:130
msgid "use given config file"
msgstr ""
#: builtin/config.c:131
msgid "blob-id"
msgstr ""
#: builtin/config.c:131
msgid "read config from given blob object"
msgstr ""
#: builtin/config.c:132
msgid "Action"
msgstr ""
#: builtin/config.c:133
msgid "get value: name [value-regex]"
msgstr ""
#: builtin/config.c:134
msgid "get all values: key [value-regex]"
msgstr ""
#: builtin/config.c:135
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
#: builtin/config.c:136
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
#: builtin/config.c:137
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
#: builtin/config.c:138
msgid "add a new variable: name value"
msgstr ""
#: builtin/config.c:139
msgid "remove a variable: name [value-regex]"
msgstr ""
#: builtin/config.c:140
msgid "remove all matches: name [value-regex]"
msgstr ""
#: builtin/config.c:141
msgid "rename section: old-name new-name"
msgstr ""
#: builtin/config.c:142
msgid "remove a section: name"
msgstr ""
#: builtin/config.c:143
msgid "list all"
msgstr ""
#: builtin/config.c:144
msgid "open an editor"
msgstr ""
#: builtin/config.c:145
msgid "find the color configured: slot [default]"
msgstr ""
#: builtin/config.c:146
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
#: builtin/config.c:147
msgid "Type"
msgstr ""
#: builtin/config.c:148 builtin/env--helper.c:38
msgid "value is given this type"
msgstr ""
#: builtin/config.c:149
msgid "value is \"true\" or \"false\""
msgstr ""
#: builtin/config.c:150
msgid "value is decimal number"
msgstr ""
#: builtin/config.c:151
msgid "value is --bool or --int"
msgstr ""
#: builtin/config.c:152
msgid "value is a path (file or directory name)"
msgstr ""
#: builtin/config.c:153
msgid "value is an expiry date"
msgstr ""
#: builtin/config.c:154
msgid "Other"
msgstr ""
#: builtin/config.c:155
msgid "terminate values with NUL byte"
msgstr ""
#: builtin/config.c:156
msgid "show variable names only"
msgstr ""
#: builtin/config.c:157
msgid "respect include directives on lookup"
msgstr ""
#: builtin/config.c:158
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
#: builtin/config.c:159
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
#: builtin/config.c:160 builtin/env--helper.c:40
msgid "value"
msgstr ""
#: builtin/config.c:160
msgid "with --get, use default value when missing entry"
msgstr ""
#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
#: builtin/config.c:176
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
#: builtin/config.c:324
#, c-format
msgid "invalid key pattern: %s"
msgstr ""
#: builtin/config.c:360
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
#: builtin/config.c:417
#, c-format
msgid "cannot parse color '%s'"
msgstr ""
#: builtin/config.c:459
msgid "unable to parse default color value"
msgstr ""
#: builtin/config.c:512 builtin/config.c:768
msgid "not in a git directory"
msgstr ""
#: builtin/config.c:515
msgid "writing to stdin is not supported"
msgstr ""
#: builtin/config.c:518
msgid "writing config blobs is not supported"
msgstr ""
#: builtin/config.c:603
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"[user]\n"
"# Please adapt and uncomment the following lines:\n"
"#\tname = %s\n"
"#\temail = %s\n"
msgstr ""
#: builtin/config.c:627
msgid "only one config file at a time"
msgstr ""
#: builtin/config.c:632
msgid "--local can only be used inside a git repository"
msgstr ""
#: builtin/config.c:635
msgid "--blob can only be used inside a git repository"
msgstr ""
#: builtin/config.c:655
msgid "$HOME not set"
msgstr ""
#: builtin/config.c:679
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
#: builtin/config.c:714
msgid "--get-color and variable type are incoherent"
msgstr ""
#: builtin/config.c:719
msgid "only one action at a time"
msgstr ""
#: builtin/config.c:732
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
#: builtin/config.c:738
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
#: builtin/config.c:744
msgid "--default is only applicable to --get"
msgstr ""
#: builtin/config.c:757
#, c-format
msgid "unable to read config file '%s'"
msgstr ""
#: builtin/config.c:760
msgid "error processing config file(s)"
msgstr ""
#: builtin/config.c:770
msgid "editing stdin is not supported"
msgstr ""
#: builtin/config.c:772
msgid "editing blobs is not supported"
msgstr ""
#: builtin/config.c:786
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
#: builtin/config.c:799
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
#: builtin/config.c:873 builtin/config.c:884
#, c-format
msgid "no such section: %s"
msgstr ""
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr ""
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr ""
#: builtin/describe.c:62
msgid "head"
msgstr ""
#: builtin/describe.c:62
msgid "lightweight"
msgstr ""
#: builtin/describe.c:62
msgid "annotated"
msgstr ""
#: builtin/describe.c:275
#, c-format
msgid "annotated tag %s not available"
msgstr ""
#: builtin/describe.c:279
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
#: builtin/describe.c:281
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
#: builtin/describe.c:325
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
#: builtin/describe.c:327
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
#: builtin/describe.c:394
#, c-format
msgid "finished search at %s\n"
msgstr ""
#: builtin/describe.c:421
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
#: builtin/describe.c:425
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
#: builtin/describe.c:455
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
#: builtin/describe.c:458
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
#: builtin/describe.c:526
#, c-format
msgid "describe %s\n"
msgstr ""
#: builtin/describe.c:529
#, c-format
msgid "Not a valid object name %s"
msgstr ""
#: builtin/describe.c:537
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
#: builtin/describe.c:551
msgid "find the tag that comes after the commit"
msgstr ""
#: builtin/describe.c:552
msgid "debug search strategy on stderr"
msgstr ""
#: builtin/describe.c:553
msgid "use any ref"
msgstr ""
#: builtin/describe.c:554
msgid "use any tag, even unannotated"
msgstr ""
#: builtin/describe.c:555
msgid "always use long format"
msgstr ""
#: builtin/describe.c:556
msgid "only follow first parent"
msgstr ""
#: builtin/describe.c:559
msgid "only output exact matches"
msgstr ""
#: builtin/describe.c:561
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
#: builtin/describe.c:563
msgid "only consider tags matching <pattern>"
msgstr ""
#: builtin/describe.c:565
msgid "do not consider tags matching <pattern>"
msgstr ""
#: builtin/describe.c:567 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr ""
#: builtin/describe.c:568 builtin/describe.c:571
msgid "mark"
msgstr ""
#: builtin/describe.c:569
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
#: builtin/describe.c:572
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
#: builtin/describe.c:590
msgid "--long is incompatible with --abbrev=0"
msgstr ""
#: builtin/describe.c:619
msgid "No names found, cannot describe anything."
msgstr ""
#: builtin/describe.c:670
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
#: builtin/describe.c:672
msgid "--broken is incompatible with commit-ishes"
msgstr ""
#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr ""
#: builtin/diff.c:350
msgid "Not a git repository"
msgstr ""
#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr ""
#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr ""
#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr ""
#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr ""
#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
#: builtin/difftool.c:634
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
#: builtin/difftool.c:636
msgid "working tree file has been left."
msgstr ""
#: builtin/difftool.c:647
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
#: builtin/difftool.c:648
msgid "you may want to cleanup or recover these."
msgstr ""
#: builtin/difftool.c:697
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
#: builtin/difftool.c:699
msgid "perform a full-directory diff"
msgstr ""
#: builtin/difftool.c:701
msgid "do not prompt before launching a diff tool"
msgstr ""
#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr ""
#: builtin/difftool.c:707
msgid "tool"
msgstr ""
#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr ""
#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr ""
#: builtin/difftool.c:717
msgid "passed to `diff`"
msgstr ""
#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr ""
#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr ""
#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
#: builtin/env--helper.c:37 builtin/hash-object.c:98
msgid "type"
msgstr ""
#: builtin/env--helper.c:41
msgid "default for git_env_*(...) to fall back on"
msgstr ""
#: builtin/env--helper.c:43
msgid "be quiet only use git_env_*() value as exit code"
msgstr ""
#: builtin/env--helper.c:62
#, c-format
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr ""
#: builtin/env--helper.c:77
#, c-format
msgid ""
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
"%s`"
msgstr ""
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr ""
#: builtin/fast-export.c:853
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
#: builtin/fast-export.c:1152
msgid "show progress after <n> objects"
msgstr ""
#: builtin/fast-export.c:1154
msgid "select handling of signed tags"
msgstr ""
#: builtin/fast-export.c:1157
msgid "select handling of tags that tag filtered objects"
msgstr ""
#: builtin/fast-export.c:1160
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
#: builtin/fast-export.c:1163
msgid "Dump marks to this file"
msgstr ""
#: builtin/fast-export.c:1165
msgid "Import marks from this file"
msgstr ""
#: builtin/fast-export.c:1169
msgid "Import marks from this file if it exists"
msgstr ""
#: builtin/fast-export.c:1171
msgid "Fake a tagger when tags lack one"
msgstr ""
#: builtin/fast-export.c:1173
msgid "Output full tree for each commit"
msgstr ""
#: builtin/fast-export.c:1175
msgid "Use the done feature to terminate the stream"
msgstr ""
#: builtin/fast-export.c:1176
msgid "Skip output of blob data"
msgstr ""
#: builtin/fast-export.c:1177 builtin/log.c:1705
msgid "refspec"
msgstr ""
#: builtin/fast-export.c:1178
msgid "Apply refspec to exported refs"
msgstr ""
#: builtin/fast-export.c:1179
msgid "anonymize output"
msgstr ""
#: builtin/fast-export.c:1181
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
#: builtin/fast-export.c:1183
msgid "Show original object ids of blobs/commits"
msgstr ""
#: builtin/fast-export.c:1185
msgid "Label tags with mark ids"
msgstr ""
#: builtin/fast-export.c:1220
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
#: builtin/fetch.c:34
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/fetch.c:35
msgid "git fetch [<options>] <group>"
msgstr ""
#: builtin/fetch.c:36
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
#: builtin/fetch.c:37
msgid "git fetch --all [<options>]"
msgstr ""
#: builtin/fetch.c:116
msgid "fetch.parallel cannot be negative"
msgstr ""
#: builtin/fetch.c:139 builtin/pull.c:184
msgid "fetch from all remotes"
msgstr ""
#: builtin/fetch.c:141 builtin/pull.c:228
msgid "set upstream for git pull/fetch"
msgstr ""
#: builtin/fetch.c:143 builtin/pull.c:187
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
#: builtin/fetch.c:145 builtin/pull.c:190
msgid "path to upload pack on remote end"
msgstr ""
#: builtin/fetch.c:146
msgid "force overwrite of local reference"
msgstr ""
#: builtin/fetch.c:148
msgid "fetch from multiple remotes"
msgstr ""
#: builtin/fetch.c:150 builtin/pull.c:194
msgid "fetch all tags and associated objects"
msgstr ""
#: builtin/fetch.c:152
msgid "do not fetch all tags (--no-tags)"
msgstr ""
#: builtin/fetch.c:154
msgid "number of submodules fetched in parallel"
msgstr ""
#: builtin/fetch.c:156 builtin/pull.c:197
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
#: builtin/fetch.c:158
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
msgid "on-demand"
msgstr ""
#: builtin/fetch.c:160
msgid "control recursive fetching of submodules"
msgstr ""
#: builtin/fetch.c:164 builtin/pull.c:205
msgid "keep downloaded pack"
msgstr ""
#: builtin/fetch.c:166
msgid "allow updating of HEAD ref"
msgstr ""
#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
msgid "deepen history of shallow clone"
msgstr ""
#: builtin/fetch.c:171
msgid "deepen history of shallow repository based on time"
msgstr ""
#: builtin/fetch.c:177 builtin/pull.c:211
msgid "convert to a complete repository"
msgstr ""
#: builtin/fetch.c:180
msgid "prepend this to submodule path output"
msgstr ""
#: builtin/fetch.c:183
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
#: builtin/fetch.c:187 builtin/pull.c:214
msgid "accept refs that update .git/shallow"
msgstr ""
#: builtin/fetch.c:188 builtin/pull.c:216
msgid "refmap"
msgstr ""
#: builtin/fetch.c:189 builtin/pull.c:217
msgid "specify fetch refmap"
msgstr ""
#: builtin/fetch.c:196
msgid "report that we have only objects reachable from this object"
msgstr ""
#: builtin/fetch.c:199
msgid "run 'gc --auto' after fetching"
msgstr ""
#: builtin/fetch.c:201 builtin/pull.c:226
msgid "check for forced-updates on all updated branches"
msgstr ""
#: builtin/fetch.c:203
msgid "write the commit-graph after fetching"
msgstr ""
#: builtin/fetch.c:513
msgid "Couldn't find remote ref HEAD"
msgstr ""
#: builtin/fetch.c:653
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
#: builtin/fetch.c:751
#, c-format
msgid "object %s not found"
msgstr ""
#: builtin/fetch.c:755
msgid "[up to date]"
msgstr ""
#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
msgid "[rejected]"
msgstr ""
#: builtin/fetch.c:769
msgid "can't fetch in current branch"
msgstr ""
#: builtin/fetch.c:779
msgid "[tag update]"
msgstr ""
#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
#: builtin/fetch.c:851
msgid "unable to update local ref"
msgstr ""
#: builtin/fetch.c:784
msgid "would clobber existing tag"
msgstr ""
#: builtin/fetch.c:806
msgid "[new tag]"
msgstr ""
#: builtin/fetch.c:809
msgid "[new branch]"
msgstr ""
#: builtin/fetch.c:812
msgid "[new ref]"
msgstr ""
#: builtin/fetch.c:851
msgid "forced update"
msgstr ""
#: builtin/fetch.c:856
msgid "non-fast-forward"
msgstr ""
#: builtin/fetch.c:877
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
#: builtin/fetch.c:881
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
" to avoid this check.\n"
msgstr ""
#: builtin/fetch.c:920
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
#: builtin/fetch.c:941
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
#: builtin/fetch.c:1026 builtin/fetch.c:1164
#, c-format
msgid "From %.*s\n"
msgstr ""
#: builtin/fetch.c:1037
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
#: builtin/fetch.c:1134
#, c-format
msgid " (%s will become dangling)"
msgstr ""
#: builtin/fetch.c:1135
#, c-format
msgid " (%s has become dangling)"
msgstr ""
#: builtin/fetch.c:1167
msgid "[deleted]"
msgstr ""
#: builtin/fetch.c:1168 builtin/remote.c:1112
msgid "(none)"
msgstr ""
#: builtin/fetch.c:1191
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
#: builtin/fetch.c:1210
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
#: builtin/fetch.c:1213
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
#: builtin/fetch.c:1421
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
#: builtin/fetch.c:1436
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
#: builtin/fetch.c:1438
msgid "not setting upstream for a remote tag"
msgstr ""
#: builtin/fetch.c:1440
msgid "unknown branch type"
msgstr ""
#: builtin/fetch.c:1442
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
#: builtin/fetch.c:1568 builtin/fetch.c:1631
#, c-format
msgid "Fetching %s\n"
msgstr ""
#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr ""
#: builtin/fetch.c:1590
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
#: builtin/fetch.c:1693
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
#: builtin/fetch.c:1730
msgid "You need to specify a tag name."
msgstr ""
#: builtin/fetch.c:1780
msgid "Negative depth in --deepen is not supported"
msgstr ""
#: builtin/fetch.c:1782
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
#: builtin/fetch.c:1787
msgid "--depth and --unshallow cannot be used together"
msgstr ""
#: builtin/fetch.c:1789
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
#: builtin/fetch.c:1805
msgid "fetch --all does not take a repository argument"
msgstr ""
#: builtin/fetch.c:1807
msgid "fetch --all does not make sense with refspecs"
msgstr ""
#: builtin/fetch.c:1816
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
#: builtin/fetch.c:1823
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
#: builtin/fetch.c:1841
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
#: builtin/fmt-merge-msg.c:671
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
#: builtin/fmt-merge-msg.c:674
msgid "alias for --log (deprecated)"
msgstr ""
#: builtin/fmt-merge-msg.c:677
msgid "text"
msgstr ""
#: builtin/fmt-merge-msg.c:678
msgid "use <text> as start of message"
msgstr ""
#: builtin/fmt-merge-msg.c:679
msgid "file to read from"
msgstr ""
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr ""
#: builtin/for-each-ref.c:12
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr ""
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr ""
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr ""
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr ""
#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr ""
#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr ""
#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr ""
#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr ""
#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr ""
#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr ""
#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr ""
#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
msgid "unknown"
msgstr ""
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:100 builtin/fsck.c:120
#, c-format
msgid "error in %s %s: %s"
msgstr ""
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:114
#, c-format
msgid "warning in %s %s: %s"
msgstr ""
#: builtin/fsck.c:143 builtin/fsck.c:146
#, c-format
msgid "broken link from %7s %s"
msgstr ""
#: builtin/fsck.c:155
msgid "wrong object type in link"
msgstr ""
#: builtin/fsck.c:171
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
#: builtin/fsck.c:282
#, c-format
msgid "missing %s %s"
msgstr ""
#: builtin/fsck.c:309
#, c-format
msgid "unreachable %s %s"
msgstr ""
#: builtin/fsck.c:329
#, c-format
msgid "dangling %s %s"
msgstr ""
#: builtin/fsck.c:339
msgid "could not create lost-found"
msgstr ""
#: builtin/fsck.c:350
#, c-format
msgid "could not finish '%s'"
msgstr ""
#: builtin/fsck.c:367
#, c-format
msgid "Checking %s"
msgstr ""
#: builtin/fsck.c:405
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr ""
#: builtin/fsck.c:424
#, c-format
msgid "Checking %s %s"
msgstr ""
#: builtin/fsck.c:429
msgid "broken links"
msgstr ""
#: builtin/fsck.c:438
#, c-format
msgid "root %s"
msgstr ""
#: builtin/fsck.c:446
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
#: builtin/fsck.c:475
#, c-format
msgid "%s: object corrupt or missing"
msgstr ""
#: builtin/fsck.c:500
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr ""
#: builtin/fsck.c:514
#, c-format
msgid "Checking reflog %s->%s"
msgstr ""
#: builtin/fsck.c:548
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr ""
#: builtin/fsck.c:555
#, c-format
msgid "%s: not a commit"
msgstr ""
#: builtin/fsck.c:609
msgid "notice: No default references"
msgstr ""
#: builtin/fsck.c:624
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr ""
#: builtin/fsck.c:637
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
#: builtin/fsck.c:657
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
#: builtin/fsck.c:672
msgid "Checking object directory"
msgstr ""
#: builtin/fsck.c:675
msgid "Checking object directories"
msgstr ""
#: builtin/fsck.c:690
#, c-format
msgid "Checking %s link"
msgstr ""
#: builtin/fsck.c:695 builtin/index-pack.c:843
#, c-format
msgid "invalid %s"
msgstr ""
#: builtin/fsck.c:702
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
#: builtin/fsck.c:708
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
#: builtin/fsck.c:712
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
#: builtin/fsck.c:724
msgid "Checking cache tree"
msgstr ""
#: builtin/fsck.c:729
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
#: builtin/fsck.c:738
msgid "non-tree in cache-tree"
msgstr ""
#: builtin/fsck.c:769
msgid "git fsck [<options>] [<object>...]"
msgstr ""
#: builtin/fsck.c:775
msgid "show unreachable objects"
msgstr ""
#: builtin/fsck.c:776
msgid "show dangling objects"
msgstr ""
#: builtin/fsck.c:777
msgid "report tags"
msgstr ""
#: builtin/fsck.c:778
msgid "report root nodes"
msgstr ""
#: builtin/fsck.c:779
msgid "make index objects head nodes"
msgstr ""
#: builtin/fsck.c:780
msgid "make reflogs head nodes (default)"
msgstr ""
#: builtin/fsck.c:781
msgid "also consider packs and alternate objects"
msgstr ""
#: builtin/fsck.c:782
msgid "check only connectivity"
msgstr ""
#: builtin/fsck.c:783
msgid "enable more strict checking"
msgstr ""
#: builtin/fsck.c:785
msgid "write dangling objects in .git/lost-found"
msgstr ""
#: builtin/fsck.c:786 builtin/prune.c:132
msgid "show progress"
msgstr ""
#: builtin/fsck.c:787
msgid "show verbose names for reachable objects"
msgstr ""
#: builtin/fsck.c:846 builtin/index-pack.c:225
msgid "Checking objects"
msgstr ""
#: builtin/fsck.c:874
#, c-format
msgid "%s: object missing"
msgstr ""
#: builtin/fsck.c:885
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
#: builtin/gc.c:35
msgid "git gc [<options>]"
msgstr ""
#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
#: builtin/gc.c:126
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr ""
#: builtin/gc.c:475 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr ""
#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr ""
#: builtin/gc.c:491
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"and remove %s.\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
#: builtin/gc.c:539
msgid "prune unreferenced objects"
msgstr ""
#: builtin/gc.c:541
msgid "be more thorough (increased runtime)"
msgstr ""
#: builtin/gc.c:542
msgid "enable auto-gc mode"
msgstr ""
#: builtin/gc.c:545
msgid "force running gc even if there may be another gc running"
msgstr ""
#: builtin/gc.c:548
msgid "repack all other packs except the largest pack"
msgstr ""
#: builtin/gc.c:565
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
#: builtin/gc.c:576
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
#: builtin/gc.c:596
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
#: builtin/gc.c:598
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
#: builtin/gc.c:599
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
#: builtin/gc.c:639
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
#: builtin/gc.c:694
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
#: builtin/pack-objects.c:2854
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
#: builtin/grep.c:633
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
#: builtin/grep.c:704
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
#: builtin/grep.c:803
msgid "search in index instead of in the work tree"
msgstr ""
#: builtin/grep.c:805
msgid "find in contents not managed by git"
msgstr ""
#: builtin/grep.c:807
msgid "search in both tracked and untracked files"
msgstr ""
#: builtin/grep.c:809
msgid "ignore files specified via '.gitignore'"
msgstr ""
#: builtin/grep.c:811
msgid "recursively search in each submodule"
msgstr ""
#: builtin/grep.c:814
msgid "show non-matching lines"
msgstr ""
#: builtin/grep.c:816
msgid "case insensitive matching"
msgstr ""
#: builtin/grep.c:818
msgid "match patterns only at word boundaries"
msgstr ""
#: builtin/grep.c:820
msgid "process binary files as text"
msgstr ""
#: builtin/grep.c:822
msgid "don't match patterns in binary files"
msgstr ""
#: builtin/grep.c:825
msgid "process binary files with textconv filters"
msgstr ""
#: builtin/grep.c:827
msgid "search in subdirectories (default)"
msgstr ""
#: builtin/grep.c:829
msgid "descend at most <depth> levels"
msgstr ""
#: builtin/grep.c:833
msgid "use extended POSIX regular expressions"
msgstr ""
#: builtin/grep.c:836
msgid "use basic POSIX regular expressions (default)"
msgstr ""
#: builtin/grep.c:839
msgid "interpret patterns as fixed strings"
msgstr ""
#: builtin/grep.c:842
msgid "use Perl-compatible regular expressions"
msgstr ""
#: builtin/grep.c:845
msgid "show line numbers"
msgstr ""
#: builtin/grep.c:846
msgid "show column number of first match"
msgstr ""
#: builtin/grep.c:847
msgid "don't show filenames"
msgstr ""
#: builtin/grep.c:848
msgid "show filenames"
msgstr ""
#: builtin/grep.c:850
msgid "show filenames relative to top directory"
msgstr ""
#: builtin/grep.c:852
msgid "show only filenames instead of matching lines"
msgstr ""
#: builtin/grep.c:854
msgid "synonym for --files-with-matches"
msgstr ""
#: builtin/grep.c:857
msgid "show only the names of files without match"
msgstr ""
#: builtin/grep.c:859
msgid "print NUL after filenames"
msgstr ""
#: builtin/grep.c:862
msgid "show only matching parts of a line"
msgstr ""
#: builtin/grep.c:864
msgid "show the number of matches instead of matching lines"
msgstr ""
#: builtin/grep.c:865
msgid "highlight matches"
msgstr ""
#: builtin/grep.c:867
msgid "print empty line between matches from different files"
msgstr ""
#: builtin/grep.c:869
msgid "show filename only once above matches from same file"
msgstr ""
#: builtin/grep.c:872
msgid "show <n> context lines before and after matches"
msgstr ""
#: builtin/grep.c:875
msgid "show <n> context lines before matches"
msgstr ""
#: builtin/grep.c:877
msgid "show <n> context lines after matches"
msgstr ""
#: builtin/grep.c:879
msgid "use <n> worker threads"
msgstr ""
#: builtin/grep.c:880
msgid "shortcut for -C NUM"
msgstr ""
#: builtin/grep.c:883
msgid "show a line with the function name before matches"
msgstr ""
#: builtin/grep.c:885
msgid "show the surrounding function"
msgstr ""
#: builtin/grep.c:888
msgid "read patterns from file"
msgstr ""
#: builtin/grep.c:890
msgid "match <pattern>"
msgstr ""
#: builtin/grep.c:892
msgid "combine patterns specified with -e"
msgstr ""
#: builtin/grep.c:904
msgid "indicate hit with exit status without output"
msgstr ""
#: builtin/grep.c:906
msgid "show only matches from files that match all patterns"
msgstr ""
#: builtin/grep.c:908
msgid "show parse tree for grep expression"
msgstr ""
#: builtin/grep.c:912
msgid "pager"
msgstr ""
#: builtin/grep.c:912
msgid "show matching files in the pager"
msgstr ""
#: builtin/grep.c:916
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
#: builtin/grep.c:983
msgid "no pattern given"
msgstr ""
#: builtin/grep.c:1019
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
#: builtin/grep.c:1027
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
#: builtin/grep.c:1057
msgid "--untracked not supported with --recurse-submodules"
msgstr ""
#: builtin/grep.c:1061
msgid "invalid option combination, ignoring --threads"
msgstr ""
#: builtin/grep.c:1064 builtin/pack-objects.c:3547
msgid "no threads support, ignoring --threads"
msgstr ""
#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
#: builtin/grep.c:1101
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
#: builtin/grep.c:1127
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
#: builtin/grep.c:1133
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
#: builtin/grep.c:1141
msgid "both --cached and trees are given"
msgstr ""
#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr ""
#: builtin/hash-object.c:98
msgid "object type"
msgstr ""
#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr ""
#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr ""
#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr ""
#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr ""
#: builtin/help.c:46
msgid "print all available commands"
msgstr ""
#: builtin/help.c:47
msgid "exclude guides"
msgstr ""
#: builtin/help.c:48
msgid "print list of useful guides"
msgstr ""
#: builtin/help.c:49
msgid "print all configuration variable names"
msgstr ""
#: builtin/help.c:51
msgid "show man page"
msgstr ""
#: builtin/help.c:52
msgid "show manual in web browser"
msgstr ""
#: builtin/help.c:54
msgid "show info page"
msgstr ""
#: builtin/help.c:56
msgid "print command description"
msgstr ""
#: builtin/help.c:61
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr ""
#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr ""
#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr ""
#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr ""
#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr ""
#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr ""
#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr ""
#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr ""
#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:268
msgid "early EOF"
msgstr ""
#: builtin/index-pack.c:269
msgid "read error on input"
msgstr ""
#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr ""
#: builtin/index-pack.c:288 builtin/pack-objects.c:606
msgid "pack too large for current definition of off_t"
msgstr ""
#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr ""
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr ""
#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr ""
#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr ""
#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr ""
#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr ""
#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr ""
#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr ""
#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
#: builtin/index-pack.c:804 builtin/index-pack.c:813
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
#: builtin/index-pack.c:738 builtin/pack-objects.c:158
#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
#, c-format
msgid "unable to read %s"
msgstr ""
#: builtin/index-pack.c:802
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
#: builtin/index-pack.c:810
#, c-format
msgid "cannot read existing object %s"
msgstr ""
#: builtin/index-pack.c:824
#, c-format
msgid "invalid blob object %s"
msgstr ""
#: builtin/index-pack.c:827 builtin/index-pack.c:846
msgid "fsck error in packed object"
msgstr ""
#: builtin/index-pack.c:848
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
#: builtin/index-pack.c:920 builtin/index-pack.c:951
msgid "failed to apply delta"
msgstr ""
#: builtin/index-pack.c:1121
msgid "Receiving objects"
msgstr ""
#: builtin/index-pack.c:1121
msgid "Indexing objects"
msgstr ""
#: builtin/index-pack.c:1155
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
#: builtin/index-pack.c:1160
msgid "cannot fstat packfile"
msgstr ""
#: builtin/index-pack.c:1163
msgid "pack has junk at the end"
msgstr ""
#: builtin/index-pack.c:1175
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
#: builtin/index-pack.c:1198
msgid "Resolving deltas"
msgstr ""
#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
#, c-format
msgid "unable to create thread: %s"
msgstr ""
#: builtin/index-pack.c:1249
msgid "confusion beyond insanity"
msgstr ""
#: builtin/index-pack.c:1255
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1267
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
#: builtin/index-pack.c:1271
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1295
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
#: builtin/index-pack.c:1392
#, c-format
msgid "local object %s is corrupt"
msgstr ""
#: builtin/index-pack.c:1406
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
#: builtin/index-pack.c:1431
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
#: builtin/index-pack.c:1439
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
#: builtin/index-pack.c:1463
msgid "error while closing pack file"
msgstr ""
#: builtin/index-pack.c:1477
msgid "cannot store pack file"
msgstr ""
#: builtin/index-pack.c:1485
msgid "cannot store index file"
msgstr ""
#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
#: builtin/index-pack.c:1597
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
#: builtin/index-pack.c:1599
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
#: builtin/index-pack.c:1647
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1654
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
#: builtin/index-pack.c:1693
msgid "Cannot come back to cwd"
msgstr ""
#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
#, c-format
msgid "bad %s"
msgstr ""
#: builtin/index-pack.c:1781
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
#: builtin/index-pack.c:1783
msgid "--stdin requires a git repository"
msgstr ""
#: builtin/index-pack.c:1789
msgid "--verify with no packfile name given"
msgstr ""
#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr ""
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr ""
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr ""
#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
#: builtin/init-db.c:80
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
msgstr ""
#: builtin/init-db.c:121
#, c-format
msgid "templates not found in %s"
msgstr ""
#: builtin/init-db.c:136
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr ""
#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr ""
#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr ""
#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
#: builtin/init-db.c:491
msgid "permissions"
msgstr ""
#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr ""
#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr ""
#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr ""
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr ""
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr ""
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr ""
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr ""
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr ""
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr ""
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr ""
#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr ""
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr ""
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr ""
#: builtin/log.c:56
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
#: builtin/log.c:57
msgid "git show [<options>] <object>..."
msgstr ""
#: builtin/log.c:110
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
#: builtin/log.c:174
msgid "show source"
msgstr ""
#: builtin/log.c:175
msgid "Use mail map file"
msgstr ""
#: builtin/log.c:177
msgid "only decorate refs that match <pattern>"
msgstr ""
#: builtin/log.c:179
msgid "do not decorate refs that match <pattern>"
msgstr ""
#: builtin/log.c:180
msgid "decorate options"
msgstr ""
#: builtin/log.c:183
msgid "Process line range n,m in file, counting from 1"
msgstr ""
#: builtin/log.c:281
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
#: builtin/log.c:535
#, c-format
msgid "git show %s: bad file"
msgstr ""
#: builtin/log.c:550 builtin/log.c:645
#, c-format
msgid "could not read object %s"
msgstr ""
#: builtin/log.c:670
#, c-format
msgid "unknown type: %d"
msgstr ""
#: builtin/log.c:814
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
#: builtin/log.c:821
msgid "format.headers without value"
msgstr ""
#: builtin/log.c:936
msgid "name of output directory is too long"
msgstr ""
#: builtin/log.c:952
#, c-format
msgid "cannot open patch file %s"
msgstr ""
#: builtin/log.c:969
msgid "need exactly one range"
msgstr ""
#: builtin/log.c:979
msgid "not a range"
msgstr ""
#: builtin/log.c:1143
msgid "cover letter needs email format"
msgstr ""
#: builtin/log.c:1149
msgid "failed to create cover-letter file"
msgstr ""
#: builtin/log.c:1228
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
#: builtin/log.c:1255
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
#: builtin/log.c:1313
msgid "two output directories?"
msgstr ""
#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
#, c-format
msgid "unknown commit %s"
msgstr ""
#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
#: builtin/log.c:1439
msgid "could not find exact merge base"
msgstr ""
#: builtin/log.c:1443
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
#: builtin/log.c:1463
msgid "failed to find exact merge base"
msgstr ""
#: builtin/log.c:1474
msgid "base commit should be the ancestor of revision list"
msgstr ""
#: builtin/log.c:1478
msgid "base commit shouldn't be in revision list"
msgstr ""
#: builtin/log.c:1531
msgid "cannot get patch id"
msgstr ""
#: builtin/log.c:1583
msgid "failed to infer range-diff ranges"
msgstr ""
#: builtin/log.c:1629
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
#: builtin/log.c:1632
msgid "use [PATCH] even with multiple patches"
msgstr ""
#: builtin/log.c:1636
msgid "print patches to standard out"
msgstr ""
#: builtin/log.c:1638
msgid "generate a cover letter"
msgstr ""
#: builtin/log.c:1640
msgid "use simple number sequence for output file names"
msgstr ""
#: builtin/log.c:1641
msgid "sfx"
msgstr ""
#: builtin/log.c:1642
msgid "use <sfx> instead of '.patch'"
msgstr ""
#: builtin/log.c:1644
msgid "start numbering patches at <n> instead of 1"
msgstr ""
#: builtin/log.c:1646
msgid "mark the series as Nth re-roll"
msgstr ""
#: builtin/log.c:1648
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
#: builtin/log.c:1651
msgid "cover-from-description-mode"
msgstr ""
#: builtin/log.c:1652
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
#: builtin/log.c:1654
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
#: builtin/log.c:1657
msgid "store resulting files in <dir>"
msgstr ""
#: builtin/log.c:1660
msgid "don't strip/add [PATCH]"
msgstr ""
#: builtin/log.c:1663
msgid "don't output binary diffs"
msgstr ""
#: builtin/log.c:1665
msgid "output all-zero hash in From header"
msgstr ""
#: builtin/log.c:1667
msgid "don't include a patch matching a commit upstream"
msgstr ""
#: builtin/log.c:1669
msgid "show patch format instead of default (patch + stat)"
msgstr ""
#: builtin/log.c:1671
msgid "Messaging"
msgstr ""
#: builtin/log.c:1672
msgid "header"
msgstr ""
#: builtin/log.c:1673
msgid "add email header"
msgstr ""
#: builtin/log.c:1674 builtin/log.c:1676
msgid "email"
msgstr ""
#: builtin/log.c:1674
msgid "add To: header"
msgstr ""
#: builtin/log.c:1676
msgid "add Cc: header"
msgstr ""
#: builtin/log.c:1678
msgid "ident"
msgstr ""
#: builtin/log.c:1679
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
#: builtin/log.c:1681
msgid "message-id"
msgstr ""
#: builtin/log.c:1682
msgid "make first mail a reply to <message-id>"
msgstr ""
#: builtin/log.c:1683 builtin/log.c:1686
msgid "boundary"
msgstr ""
#: builtin/log.c:1684
msgid "attach the patch"
msgstr ""
#: builtin/log.c:1687
msgid "inline the patch"
msgstr ""
#: builtin/log.c:1691
msgid "enable message threading, styles: shallow, deep"
msgstr ""
#: builtin/log.c:1693
msgid "signature"
msgstr ""
#: builtin/log.c:1694
msgid "add a signature"
msgstr ""
#: builtin/log.c:1695
msgid "base-commit"
msgstr ""
#: builtin/log.c:1696
msgid "add prerequisite tree info to the patch series"
msgstr ""
#: builtin/log.c:1698
msgid "add a signature from a file"
msgstr ""
#: builtin/log.c:1699
msgid "don't print the patch filenames"
msgstr ""
#: builtin/log.c:1701
msgid "show progress while generating patches"
msgstr ""
#: builtin/log.c:1703
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
#: builtin/log.c:1706
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
#: builtin/log.c:1708
msgid "percentage by which creation is weighted"
msgstr ""
#: builtin/log.c:1792
#, c-format
msgid "invalid ident line: %s"
msgstr ""
#: builtin/log.c:1807
msgid "-n and -k are mutually exclusive"
msgstr ""
#: builtin/log.c:1809
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
#: builtin/log.c:1817
msgid "--name-only does not make sense"
msgstr ""
#: builtin/log.c:1819
msgid "--name-status does not make sense"
msgstr ""
#: builtin/log.c:1821
msgid "--check does not make sense"
msgstr ""
#: builtin/log.c:1854
msgid "standard output, or directory, which one?"
msgstr ""
#: builtin/log.c:1958
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
#: builtin/log.c:1962
msgid "Interdiff:"
msgstr ""
#: builtin/log.c:1963
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
#: builtin/log.c:1969
msgid "--creation-factor requires --range-diff"
msgstr ""
#: builtin/log.c:1973
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
#: builtin/log.c:1981
msgid "Range-diff:"
msgstr ""
#: builtin/log.c:1982
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
#: builtin/log.c:1993
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
#: builtin/log.c:2029
msgid "Generating patches"
msgstr ""
#: builtin/log.c:2073
msgid "failed to create output files"
msgstr ""
#: builtin/log.c:2132
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
#: builtin/log.c:2186
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr ""
#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr ""
#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr ""
#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr ""
#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr ""
#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr ""
#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr ""
#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr ""
#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr ""
#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr ""
#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr ""
#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr ""
#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr ""
#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr ""
#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr ""
#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr ""
#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr ""
#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr ""
#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr ""
#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr ""
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repository> [<refs>...]]"
msgstr ""
#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr ""
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
msgid "exec"
msgstr ""
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
msgid "path of git-upload-pack on the remote host"
msgstr ""
#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr ""
#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr ""
#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr ""
#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr ""
#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr ""
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr ""
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr ""
#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr ""
#: builtin/ls-tree.c:136
msgid "include object size"
msgstr ""
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr ""
#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr ""
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr ""
#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr ""
#: builtin/merge.c:56
msgid "git merge --abort"
msgstr ""
#: builtin/merge.c:57
msgid "git merge --continue"
msgstr ""
#: builtin/merge.c:119
msgid "switch `m' requires a value"
msgstr ""
#: builtin/merge.c:142
#, c-format
msgid "option `%s' requires a value"
msgstr ""
#: builtin/merge.c:188
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
#: builtin/merge.c:189
#, c-format
msgid "Available strategies are:"
msgstr ""
#: builtin/merge.c:194
#, c-format
msgid "Available custom strategies are:"
msgstr ""
#: builtin/merge.c:245 builtin/pull.c:132
msgid "do not show a diffstat at the end of the merge"
msgstr ""
#: builtin/merge.c:248 builtin/pull.c:135
msgid "show a diffstat at the end of the merge"
msgstr ""
#: builtin/merge.c:249 builtin/pull.c:138
msgid "(synonym to --stat)"
msgstr ""
#: builtin/merge.c:251 builtin/pull.c:141
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
#: builtin/merge.c:254 builtin/pull.c:147
msgid "create a single commit instead of doing a merge"
msgstr ""
#: builtin/merge.c:256 builtin/pull.c:150
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
#: builtin/merge.c:258 builtin/pull.c:153
msgid "edit message before committing"
msgstr ""
#: builtin/merge.c:260
msgid "allow fast-forward (default)"
msgstr ""
#: builtin/merge.c:262 builtin/pull.c:160
msgid "abort if fast-forward is not possible"
msgstr ""
#: builtin/merge.c:266 builtin/pull.c:163
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
msgid "strategy"
msgstr ""
#: builtin/merge.c:268 builtin/pull.c:168
msgid "merge strategy to use"
msgstr ""
#: builtin/merge.c:269 builtin/pull.c:171
msgid "option=value"
msgstr ""
#: builtin/merge.c:270 builtin/pull.c:172
msgid "option for selected merge strategy"
msgstr ""
#: builtin/merge.c:272
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
#: builtin/merge.c:279
msgid "abort the current in-progress merge"
msgstr ""
#: builtin/merge.c:281
msgid "--abort but leave index and working tree alone"
msgstr ""
#: builtin/merge.c:283
msgid "continue the current in-progress merge"
msgstr ""
#: builtin/merge.c:285 builtin/pull.c:179
msgid "allow merging unrelated histories"
msgstr ""
#: builtin/merge.c:291
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
#: builtin/merge.c:308
msgid "could not run stash."
msgstr ""
#: builtin/merge.c:313
msgid "stash failed"
msgstr ""
#: builtin/merge.c:318
#, c-format
msgid "not a valid object: %s"
msgstr ""
#: builtin/merge.c:340 builtin/merge.c:357
msgid "read-tree failed"
msgstr ""
#: builtin/merge.c:387
msgid " (nothing to squash)"
msgstr ""
#: builtin/merge.c:398
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
#: builtin/merge.c:448
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
#: builtin/merge.c:499
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
#: builtin/merge.c:586
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr ""
#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr ""
#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr ""
#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr ""
#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
#: builtin/merge.c:865
msgid "Empty commit message."
msgstr ""
#: builtin/merge.c:880
#, c-format
msgid "Wonderful.\n"
msgstr ""
#: builtin/merge.c:941
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
#: builtin/merge.c:980
msgid "No current branch."
msgstr ""
#: builtin/merge.c:982
msgid "No remote for the current branch."
msgstr ""
#: builtin/merge.c:984
msgid "No default upstream defined for the current branch."
msgstr ""
#: builtin/merge.c:989
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
#: builtin/merge.c:1046
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
#: builtin/merge.c:1149
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
#: builtin/merge.c:1183
msgid "not something we can merge"
msgstr ""
#: builtin/merge.c:1286
msgid "--abort expects no arguments"
msgstr ""
#: builtin/merge.c:1290
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
#: builtin/merge.c:1299
msgid "--quit expects no arguments"
msgstr ""
#: builtin/merge.c:1312
msgid "--continue expects no arguments"
msgstr ""
#: builtin/merge.c:1316
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
#: builtin/merge.c:1332
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
#: builtin/merge.c:1339
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
#: builtin/merge.c:1342
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
#: builtin/merge.c:1356
msgid "You cannot combine --squash with --no-ff."
msgstr ""
#: builtin/merge.c:1358
msgid "You cannot combine --squash with --commit."
msgstr ""
#: builtin/merge.c:1374
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
#: builtin/merge.c:1391
msgid "Squash commit into empty head not supported yet"
msgstr ""
#: builtin/merge.c:1393
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
#: builtin/merge.c:1398
#, c-format
msgid "%s - not something we can merge"
msgstr ""
#: builtin/merge.c:1400
msgid "Can merge only exactly one commit into empty head"
msgstr ""
#: builtin/merge.c:1481
msgid "refusing to merge unrelated histories"
msgstr ""
#: builtin/merge.c:1490
msgid "Already up to date."
msgstr ""
#: builtin/merge.c:1500
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
#: builtin/merge.c:1542
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
#: builtin/merge.c:1549
#, c-format
msgid "Nope.\n"
msgstr ""
#: builtin/merge.c:1574
msgid "Already up to date. Yeeah!"
msgstr ""
#: builtin/merge.c:1580
msgid "Not possible to fast-forward, aborting."
msgstr ""
#: builtin/merge.c:1603 builtin/merge.c:1668
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
#: builtin/merge.c:1607
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
#: builtin/merge.c:1659
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
#: builtin/merge.c:1661
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
#: builtin/merge.c:1670
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
#: builtin/merge.c:1682
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr ""
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
#: builtin/merge-base.c:153
msgid "output all common ancestors"
msgstr ""
#: builtin/merge-base.c:155
msgid "find ancestors for a single n-way merge"
msgstr ""
#: builtin/merge-base.c:157
msgid "list revs not reachable from others"
msgstr ""
#: builtin/merge-base.c:159
msgid "is the first one ancestor of the other?"
msgstr ""
#: builtin/merge-base.c:161
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr ""
#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr ""
#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr ""
#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr ""
#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr ""
#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr ""
#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr ""
#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr ""
#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr ""
#: builtin/merge-recursive.c:53
#, c-format
msgid "could not parse object '%s'"
msgstr ""
#: builtin/merge-recursive.c:57
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] ""
msgstr[1] ""
#: builtin/merge-recursive.c:65
msgid "not handling anything other than two heads merge."
msgstr ""
#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
#, c-format
msgid "could not resolve ref '%s'"
msgstr ""
#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr ""
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr ""
#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr ""
#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr ""
#: builtin/multi-pack-index.c:9
msgid ""
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
"size=<size>)"
msgstr ""
#: builtin/multi-pack-index.c:26
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
#: builtin/multi-pack-index.c:29
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr ""
#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr ""
#: builtin/multi-pack-index.c:60
msgid "--batch-size option is only for 'repack' subcommand"
msgstr ""
#: builtin/multi-pack-index.c:69
#, c-format
msgid "unrecognized subcommand: %s"
msgstr ""
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr ""
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr ""
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr ""
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr ""
#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr ""
#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
#: builtin/mv.c:184
msgid "bad source"
msgstr ""
#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr ""
#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr ""
#: builtin/mv.c:199
msgid "source directory is empty"
msgstr ""
#: builtin/mv.c:224
msgid "not under version control"
msgstr ""
#: builtin/mv.c:227
msgid "destination exists"
msgstr ""
#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr ""
#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr ""
#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr ""
#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr ""
#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
#, c-format
msgid "renaming '%s' failed"
msgstr ""
#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
msgstr ""
#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
msgstr ""
#: builtin/name-rev.c:467
msgid "git name-rev [<options>] --stdin"
msgstr ""
#: builtin/name-rev.c:524
msgid "print only names (no SHA-1)"
msgstr ""
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
msgstr ""
#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
msgstr ""
#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
msgstr ""
#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
msgstr ""
#: builtin/name-rev.c:532
msgid "read from stdin"
msgstr ""
#: builtin/name-rev.c:533
msgid "allow to print `undefined` names (default)"
msgstr ""
#: builtin/name-rev.c:539
msgid "dereference tags in the input (internal use)"
msgstr ""
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr ""
#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr ""
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr ""
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr ""
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr ""
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr ""
#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr ""
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr ""
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr ""
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr ""
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr ""
#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr ""
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr ""
#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr ""
#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr ""
#: builtin/notes.c:206
msgid "unable to write note object"
msgstr ""
#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr ""
#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr ""
#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr ""
#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
#: builtin/notes.c:356
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
msgid "too many parameters"
msgstr ""
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr ""
#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr ""
#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr ""
#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr ""
#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr ""
#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr ""
#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr ""
#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr ""
#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
#: builtin/notes.c:517
msgid "too few parameters"
msgstr ""
#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr ""
#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
#: builtin/notes.c:784
msgid "General options"
msgstr ""
#: builtin/notes.c:786
msgid "Merge options"
msgstr ""
#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr ""
#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr ""
#: builtin/notes.c:796
msgid "abort notes merge"
msgstr ""
#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr ""
#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr ""
#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr ""
#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr ""
#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr ""
#: builtin/notes.c:955
msgid "report pruned notes"
msgstr ""
#: builtin/notes.c:998
msgid "notes-ref"
msgstr ""
#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr ""
#: builtin/notes.c:1034 builtin/stash.c:1643
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
#: builtin/pack-objects.c:430
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
#: builtin/pack-objects.c:441
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
#: builtin/pack-objects.c:572
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
#: builtin/pack-objects.c:783
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
#: builtin/pack-objects.c:972
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
#: builtin/pack-objects.c:985
msgid "Writing objects"
msgstr ""
#: builtin/pack-objects.c:1046 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
#: builtin/pack-objects.c:1099
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
#: builtin/pack-objects.c:1297
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
#: builtin/pack-objects.c:1724
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
#: builtin/pack-objects.c:1733
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
#: builtin/pack-objects.c:2004
msgid "Counting objects"
msgstr ""
#: builtin/pack-objects.c:2149
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
#: builtin/pack-objects.c:2245
#, c-format
msgid "object %s cannot be read"
msgstr ""
#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
#: builtin/pack-objects.c:2259
msgid "suboptimal pack - out of memory"
msgstr ""
#: builtin/pack-objects.c:2574
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
#: builtin/pack-objects.c:2713
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
#: builtin/pack-objects.c:2801
msgid "Compressing objects"
msgstr ""
#: builtin/pack-objects.c:2807
msgid "inconsistency with delta count"
msgstr ""
#: builtin/pack-objects.c:2888
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
#: builtin/pack-objects.c:2894
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
#: builtin/pack-objects.c:2992
msgid "invalid value for --missing"
msgstr ""
#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
msgid "cannot open pack index"
msgstr ""
#: builtin/pack-objects.c:3082
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
#: builtin/pack-objects.c:3167
msgid "unable to force loose object"
msgstr ""
#: builtin/pack-objects.c:3260
#, c-format
msgid "not a rev '%s'"
msgstr ""
#: builtin/pack-objects.c:3263
#, c-format
msgid "bad revision '%s'"
msgstr ""
#: builtin/pack-objects.c:3288
msgid "unable to add recent objects"
msgstr ""
#: builtin/pack-objects.c:3341
#, c-format
msgid "unsupported index version %s"
msgstr ""
#: builtin/pack-objects.c:3345
#, c-format
msgid "bad index version '%s'"
msgstr ""
#: builtin/pack-objects.c:3383
msgid "<version>[,<offset>]"
msgstr ""
#: builtin/pack-objects.c:3384
msgid "write the pack index file in the specified idx format version"
msgstr ""
#: builtin/pack-objects.c:3387
msgid "maximum size of each output pack file"
msgstr ""
#: builtin/pack-objects.c:3389
msgid "ignore borrowed objects from alternate object store"
msgstr ""
#: builtin/pack-objects.c:3391
msgid "ignore packed objects"
msgstr ""
#: builtin/pack-objects.c:3393
msgid "limit pack window by objects"
msgstr ""
#: builtin/pack-objects.c:3395
msgid "limit pack window by memory in addition to object limit"
msgstr ""
#: builtin/pack-objects.c:3397
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
#: builtin/pack-objects.c:3399
msgid "reuse existing deltas"
msgstr ""
#: builtin/pack-objects.c:3401
msgid "reuse existing objects"
msgstr ""
#: builtin/pack-objects.c:3403
msgid "use OFS_DELTA objects"
msgstr ""
#: builtin/pack-objects.c:3405
msgid "use threads when searching for best delta matches"
msgstr ""
#: builtin/pack-objects.c:3407
msgid "do not create an empty pack output"
msgstr ""
#: builtin/pack-objects.c:3409
msgid "read revision arguments from standard input"
msgstr ""
#: builtin/pack-objects.c:3411
msgid "limit the objects to those that are not yet packed"
msgstr ""
#: builtin/pack-objects.c:3414
msgid "include objects reachable from any reference"
msgstr ""
#: builtin/pack-objects.c:3417
msgid "include objects referred by reflog entries"
msgstr ""
#: builtin/pack-objects.c:3420
msgid "include objects referred to by the index"
msgstr ""
#: builtin/pack-objects.c:3423
msgid "output pack to stdout"
msgstr ""
#: builtin/pack-objects.c:3425
msgid "include tag objects that refer to objects to be packed"
msgstr ""
#: builtin/pack-objects.c:3427
msgid "keep unreachable objects"
msgstr ""
#: builtin/pack-objects.c:3429
msgid "pack loose unreachable objects"
msgstr ""
#: builtin/pack-objects.c:3431
msgid "unpack unreachable objects newer than <time>"
msgstr ""
#: builtin/pack-objects.c:3434
msgid "use the sparse reachability algorithm"
msgstr ""
#: builtin/pack-objects.c:3436
msgid "create thin packs"
msgstr ""
#: builtin/pack-objects.c:3438
msgid "create packs suitable for shallow fetches"
msgstr ""
#: builtin/pack-objects.c:3440
msgid "ignore packs that have companion .keep file"
msgstr ""
#: builtin/pack-objects.c:3442
msgid "ignore this pack"
msgstr ""
#: builtin/pack-objects.c:3444
msgid "pack compression level"
msgstr ""
#: builtin/pack-objects.c:3446
msgid "do not hide commits by grafts"
msgstr ""
#: builtin/pack-objects.c:3448
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
#: builtin/pack-objects.c:3450
msgid "write a bitmap index together with the pack index"
msgstr ""
#: builtin/pack-objects.c:3454
msgid "write a bitmap index if possible"
msgstr ""
#: builtin/pack-objects.c:3458
msgid "handling for missing objects"
msgstr ""
#: builtin/pack-objects.c:3461
msgid "do not pack objects in promisor packfiles"
msgstr ""
#: builtin/pack-objects.c:3463
msgid "respect islands during delta compression"
msgstr ""
#: builtin/pack-objects.c:3492
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
#: builtin/pack-objects.c:3497
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
#: builtin/pack-objects.c:3551
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
#: builtin/pack-objects.c:3553
msgid "minimum pack size limit is 1 MiB"
msgstr ""
#: builtin/pack-objects.c:3558
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
#: builtin/pack-objects.c:3561
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
#: builtin/pack-objects.c:3567
msgid "cannot use --filter without --stdout"
msgstr ""
#: builtin/pack-objects.c:3627
msgid "Enumerating objects"
msgstr ""
#: builtin/pack-objects.c:3657
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr ""
#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr ""
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr ""
#: builtin/prune-packed.c:9
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
#: builtin/prune-packed.c:42
msgid "Removing duplicate objects"
msgstr ""
#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
#: builtin/prune.c:131
msgid "report pruned objects"
msgstr ""
#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr ""
#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr ""
#: builtin/pull.c:45 builtin/pull.c:47
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/pull.c:122
msgid "control for recursive fetching of submodules"
msgstr ""
#: builtin/pull.c:126
msgid "Options related to merging"
msgstr ""
#: builtin/pull.c:129
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
#: builtin/pull.c:166
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
#: builtin/pull.c:182
msgid "Options related to fetching"
msgstr ""
#: builtin/pull.c:192
msgid "force overwrite of local branch"
msgstr ""
#: builtin/pull.c:200
msgid "number of submodules pulled in parallel"
msgstr ""
#: builtin/pull.c:300
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
#: builtin/pull.c:426
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
#: builtin/pull.c:428
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
#: builtin/pull.c:429
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
#: builtin/pull.c:432
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"a branch. Because this is not the default configured remote\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
#: builtin/pull.c:442 builtin/pull.c:457
msgid "See git-pull(1) for details."
msgstr ""
#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
#: builtin/rebase.c:1415 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
#: builtin/pull.c:461 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
#: builtin/pull.c:466
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
#: builtin/pull.c:576
#, c-format
msgid "unable to access commit %s"
msgstr ""
#: builtin/pull.c:857
msgid "ignoring --verify-signatures for rebase"
msgstr ""
#: builtin/pull.c:912
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
#: builtin/pull.c:920
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
#: builtin/pull.c:924
msgid "pull with rebase"
msgstr ""
#: builtin/pull.c:925
msgid "please commit or stash them."
msgstr ""
#: builtin/pull.c:950
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
#: builtin/pull.c:956
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"After making sure that you saved anything precious from\n"
"$ git diff %s\n"
"output, run\n"
"$ git reset --hard\n"
"to recover."
msgstr ""
#: builtin/pull.c:971
msgid "Cannot merge multiple branches into empty head."
msgstr ""
#: builtin/pull.c:975
msgid "Cannot rebase onto multiple branches."
msgstr ""
#: builtin/pull.c:982
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/push.c:112
msgid "tag shorthand without <tag>"
msgstr ""
#: builtin/push.c:122
msgid "--delete only accepts plain target ref names"
msgstr ""
#: builtin/push.c:168
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
#: builtin/push.c:171
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
"on the remote, use\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
" git push %s HEAD\n"
"%s"
msgstr ""
#: builtin/push.c:186
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
#: builtin/push.c:200
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
" git push --set-upstream %s %s\n"
msgstr ""
#: builtin/push.c:208
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
#: builtin/push.c:211
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
#: builtin/push.c:270
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
#: builtin/push.c:277
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:283
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:289
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"to the same ref. You may want to first integrate the remote changes\n"
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:296
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
#: builtin/push.c:299
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
#: builtin/push.c:360
#, c-format
msgid "Pushing to %s\n"
msgstr ""
#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
#: builtin/push.c:542
msgid "repository"
msgstr ""
#: builtin/push.c:543 builtin/send-pack.c:164
msgid "push all refs"
msgstr ""
#: builtin/push.c:544 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr ""
#: builtin/push.c:546
msgid "delete refs"
msgstr ""
#: builtin/push.c:547
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
#: builtin/push.c:550 builtin/send-pack.c:167
msgid "force updates"
msgstr ""
#: builtin/push.c:552 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr ""
#: builtin/push.c:553 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr ""
#: builtin/push.c:556
msgid "control recursive pushing of submodules"
msgstr ""
#: builtin/push.c:558 builtin/send-pack.c:175
msgid "use thin pack"
msgstr ""
#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr ""
#: builtin/push.c:561
msgid "set upstream for git pull/status"
msgstr ""
#: builtin/push.c:564
msgid "prune locally removed refs"
msgstr ""
#: builtin/push.c:566
msgid "bypass pre-push hook"
msgstr ""
#: builtin/push.c:567
msgid "push missing but relevant tags"
msgstr ""
#: builtin/push.c:570 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr ""
#: builtin/push.c:572 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr ""
#: builtin/push.c:590
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
#: builtin/push.c:592
msgid "--delete doesn't make sense without any refs"
msgstr ""
#: builtin/push.c:612
#, c-format
msgid "bad repository '%s'"
msgstr ""
#: builtin/push.c:613
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
" git push <name>\n"
msgstr ""
#: builtin/push.c:628
msgid "--all and --tags are incompatible"
msgstr ""
#: builtin/push.c:630
msgid "--all can't be combined with refspecs"
msgstr ""
#: builtin/push.c:634
msgid "--mirror and --tags are incompatible"
msgstr ""
#: builtin/push.c:636
msgid "--mirror can't be combined with refspecs"
msgstr ""
#: builtin/push.c:639
msgid "--all and --mirror are incompatible"
msgstr ""
#: builtin/push.c:643
msgid "push options must not have new line characters"
msgstr ""
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
#: builtin/range-diff.c:22
msgid "Percentage by which creation is weighted"
msgstr ""
#: builtin/range-diff.c:24
msgid "use simple diff colors"
msgstr ""
#: builtin/range-diff.c:26
msgid "notes"
msgstr ""
#: builtin/range-diff.c:26
msgid "passed to 'git log'"
msgstr ""
#: builtin/range-diff.c:50 builtin/range-diff.c:54
#, c-format
msgid "no .. in range: '%s'"
msgstr ""
#: builtin/range-diff.c:64
msgid "single arg format must be symmetric range"
msgstr ""
#: builtin/range-diff.c:79
msgid "need two commit ranges"
msgstr ""
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr ""
#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr ""
#: builtin/read-tree.c:129
msgid "Merging"
msgstr ""
#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr ""
#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr ""
#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr ""
#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr ""
#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr ""
#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr ""
#: builtin/read-tree.c:144
msgid "gitignore"
msgstr ""
#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr ""
#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr ""
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr ""
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr ""
#: builtin/read-tree.c:157
msgid "suppress feedback messages"
msgstr ""
#: builtin/read-tree.c:188
msgid "You need to resolve your current index first"
msgstr ""
#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
msgstr ""
#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
#: builtin/rebase.c:292
#, c-format
msgid "could not create temporary %s"
msgstr ""
#: builtin/rebase.c:298
msgid "could not mark as interactive"
msgstr ""
#: builtin/rebase.c:352
msgid "could not generate todo list"
msgstr ""
#: builtin/rebase.c:391
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
#: builtin/rebase.c:461
msgid "git rebase--interactive [<options>]"
msgstr ""
#: builtin/rebase.c:474 builtin/rebase.c:1550
msgid "(DEPRECATED) keep empty commits"
msgstr ""
#: builtin/rebase.c:478 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
#: builtin/rebase.c:480
msgid "rebase merge commits"
msgstr ""
#: builtin/rebase.c:482
msgid "keep original branch points of cousins"
msgstr ""
#: builtin/rebase.c:484
msgid "move commits that begin with squash!/fixup!"
msgstr ""
#: builtin/rebase.c:485
msgid "sign commits"
msgstr ""
#: builtin/rebase.c:487 builtin/rebase.c:1490
msgid "display a diffstat of what changed upstream"
msgstr ""
#: builtin/rebase.c:489
msgid "continue rebase"
msgstr ""
#: builtin/rebase.c:491
msgid "skip commit"
msgstr ""
#: builtin/rebase.c:492
msgid "edit the todo list"
msgstr ""
#: builtin/rebase.c:494
msgid "show the current patch"
msgstr ""
#: builtin/rebase.c:497
msgid "shorten commit ids in the todo list"
msgstr ""
#: builtin/rebase.c:499
msgid "expand commit ids in the todo list"
msgstr ""
#: builtin/rebase.c:501
msgid "check the todo list"
msgstr ""
#: builtin/rebase.c:503
msgid "rearrange fixup/squash lines"
msgstr ""
#: builtin/rebase.c:505
msgid "insert exec commands in todo list"
msgstr ""
#: builtin/rebase.c:506
msgid "onto"
msgstr ""
#: builtin/rebase.c:509
msgid "restrict-revision"
msgstr ""
#: builtin/rebase.c:509
msgid "restrict revision"
msgstr ""
#: builtin/rebase.c:511
msgid "squash-onto"
msgstr ""
#: builtin/rebase.c:512
msgid "squash onto"
msgstr ""
#: builtin/rebase.c:514
msgid "the upstream commit"
msgstr ""
#: builtin/rebase.c:516
msgid "head-name"
msgstr ""
#: builtin/rebase.c:516
msgid "head name"
msgstr ""
#: builtin/rebase.c:521
msgid "rebase strategy"
msgstr ""
#: builtin/rebase.c:522
msgid "strategy-opts"
msgstr ""
#: builtin/rebase.c:523
msgid "strategy options"
msgstr ""
#: builtin/rebase.c:524
msgid "switch-to"
msgstr ""
#: builtin/rebase.c:525
msgid "the branch or commit to checkout"
msgstr ""
#: builtin/rebase.c:526
msgid "onto-name"
msgstr ""
#: builtin/rebase.c:526
msgid "onto name"
msgstr ""
#: builtin/rebase.c:527
msgid "cmd"
msgstr ""
#: builtin/rebase.c:527
msgid "the command to run"
msgstr ""
#: builtin/rebase.c:530 builtin/rebase.c:1584
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
#: builtin/rebase.c:546
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
#: builtin/rebase.c:562
#, c-format
msgid "%s requires an interactive rebase"
msgstr ""
#: builtin/rebase.c:612
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
#: builtin/rebase.c:627
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
#: builtin/rebase.c:652
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
#: builtin/rebase.c:728
#, c-format
msgid "Could not read '%s'"
msgstr ""
#: builtin/rebase.c:746
#, c-format
msgid "Cannot store %s"
msgstr ""
#: builtin/rebase.c:853
msgid "could not determine HEAD revision"
msgstr ""
#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
#: builtin/rebase.c:1058
#, c-format
msgid ""
"\n"
"git encountered an error while preparing the patches to replay\n"
"these revisions:\n"
"\n"
" %s\n"
"\n"
"As a result, git cannot rebase them."
msgstr ""
#: builtin/rebase.c:1383
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
#: builtin/rebase.c:1401
#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
"See git-rebase(1) for details.\n"
"\n"
" git rebase '<branch>'\n"
"\n"
msgstr ""
#: builtin/rebase.c:1417
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
#: builtin/rebase.c:1447
msgid "exec commands cannot contain newlines"
msgstr ""
#: builtin/rebase.c:1451
msgid "empty exec command"
msgstr ""
#: builtin/rebase.c:1481
msgid "rebase onto given branch instead of upstream"
msgstr ""
#: builtin/rebase.c:1483
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
#: builtin/rebase.c:1485
msgid "allow pre-rebase hook to run"
msgstr ""
#: builtin/rebase.c:1487
msgid "be quiet. implies --no-stat"
msgstr ""
#: builtin/rebase.c:1493
msgid "do not show diffstat of what changed upstream"
msgstr ""
#: builtin/rebase.c:1496
msgid "add a Signed-off-by: line to each commit"
msgstr ""
#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
msgid "passed to 'git am'"
msgstr ""
#: builtin/rebase.c:1506 builtin/rebase.c:1508
msgid "passed to 'git apply'"
msgstr ""
#: builtin/rebase.c:1510 builtin/rebase.c:1513
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
#: builtin/rebase.c:1515
msgid "continue"
msgstr ""
#: builtin/rebase.c:1518
msgid "skip current patch and continue"
msgstr ""
#: builtin/rebase.c:1520
msgid "abort and check out the original branch"
msgstr ""
#: builtin/rebase.c:1523
msgid "abort but keep HEAD where it is"
msgstr ""
#: builtin/rebase.c:1524
msgid "edit the todo list during an interactive rebase"
msgstr ""
#: builtin/rebase.c:1527
msgid "show the patch file being applied or merged"
msgstr ""
#: builtin/rebase.c:1530
msgid "use apply strategies to rebase"
msgstr ""
#: builtin/rebase.c:1534
msgid "use merging strategies to rebase"
msgstr ""
#: builtin/rebase.c:1538
msgid "let the user edit the list of commits to rebase"
msgstr ""
#: builtin/rebase.c:1542
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
#: builtin/rebase.c:1547
msgid "how to handle commits that become empty"
msgstr ""
#: builtin/rebase.c:1554
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
#: builtin/rebase.c:1560
msgid "automatically stash/stash pop before and after"
msgstr ""
#: builtin/rebase.c:1562
msgid "add exec lines after each commit of the editable list"
msgstr ""
#: builtin/rebase.c:1566
msgid "allow rebasing commits with empty messages"
msgstr ""
#: builtin/rebase.c:1570
msgid "try to rebase merges instead of skipping them"
msgstr ""
#: builtin/rebase.c:1573
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
#: builtin/rebase.c:1575
msgid "use the given merge strategy"
msgstr ""
#: builtin/rebase.c:1577 builtin/revert.c:115
msgid "option"
msgstr ""
#: builtin/rebase.c:1578
msgid "pass the argument through to the merge strategy"
msgstr ""
#: builtin/rebase.c:1581
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
#: builtin/rebase.c:1598
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
#: builtin/rebase.c:1604
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
#: builtin/rebase.c:1645
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
#: builtin/rebase.c:1650
msgid "cannot combine '--keep-base' with '--onto'"
msgstr ""
#: builtin/rebase.c:1652
msgid "cannot combine '--keep-base' with '--root'"
msgstr ""
#: builtin/rebase.c:1656
msgid "No rebase in progress?"
msgstr ""
#: builtin/rebase.c:1660
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
#: builtin/rebase.c:1683
msgid "Cannot read HEAD"
msgstr ""
#: builtin/rebase.c:1695
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
#: builtin/rebase.c:1714
msgid "could not discard worktree changes"
msgstr ""
#: builtin/rebase.c:1733
#, c-format
msgid "could not move back to %s"
msgstr ""
#: builtin/rebase.c:1778
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
"case, please try\n"
"\t%s\n"
"If that is not the case, please\n"
"\t%s\n"
"and run me again. I am stopping in case you still have something\n"
"valuable there.\n"
msgstr ""
#: builtin/rebase.c:1806
msgid "switch `C' expects a numerical value"
msgstr ""
#: builtin/rebase.c:1847
#, c-format
msgid "Unknown mode: %s"
msgstr ""
#: builtin/rebase.c:1869
msgid "--strategy requires --merge or --interactive"
msgstr ""
#: builtin/rebase.c:1899
msgid "cannot combine apply options with merge options"
msgstr ""
#: builtin/rebase.c:1912
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
#: builtin/rebase.c:1937
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
#: builtin/rebase.c:1957
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
#: builtin/rebase.c:1961
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
#: builtin/rebase.c:1985
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
#: builtin/rebase.c:1991
msgid "Could not create new root commit"
msgstr ""
#: builtin/rebase.c:2017
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
#: builtin/rebase.c:2020
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
#: builtin/rebase.c:2028
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
#: builtin/rebase.c:2054
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr ""
#: builtin/rebase.c:2073
msgid "Could not resolve HEAD to a revision"
msgstr ""
#: builtin/rebase.c:2111
msgid "Cannot autostash"
msgstr ""
#: builtin/rebase.c:2114
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
#: builtin/rebase.c:2120
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
#: builtin/rebase.c:2123
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
#: builtin/rebase.c:2126
msgid "could not reset --hard"
msgstr ""
#: builtin/rebase.c:2135
msgid "Please commit or stash them."
msgstr ""
#: builtin/rebase.c:2169
#, c-format
msgid "could not switch to %s"
msgstr ""
#: builtin/rebase.c:2180
msgid "HEAD is up to date."
msgstr ""
#: builtin/rebase.c:2182
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
#: builtin/rebase.c:2190
msgid "HEAD is up to date, rebase forced."
msgstr ""
#: builtin/rebase.c:2192
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
#: builtin/rebase.c:2200
msgid "The pre-rebase hook refused to rebase."
msgstr ""
#: builtin/rebase.c:2207
#, c-format
msgid "Changes to %s:\n"
msgstr ""
#: builtin/rebase.c:2210
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
#: builtin/rebase.c:2235
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
#: builtin/rebase.c:2244
msgid "Could not detach HEAD"
msgstr ""
#: builtin/rebase.c:2253
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
msgstr ""
#: builtin/receive-pack.c:821
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"with what you pushed, and will require 'git reset --hard' to match\n"
"the work tree to HEAD.\n"
"\n"
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
"its current branch; however, this is not recommended unless you\n"
"arranged to update its work tree to match what you pushed in some\n"
"other way.\n"
"\n"
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
#: builtin/receive-pack.c:841
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
"current branch, with or without a warning message.\n"
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr ""
#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr ""
#: builtin/reflog.c:17
msgid ""
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<refs>..."
msgstr ""
#: builtin/reflog.c:22
msgid ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<refs>..."
msgstr ""
#: builtin/reflog.c:25
msgid "git reflog exists <ref>"
msgstr ""
#: builtin/reflog.c:568 builtin/reflog.c:573
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
#: builtin/reflog.c:606
#, c-format
msgid "Marking reachable objects..."
msgstr ""
#: builtin/reflog.c:644
#, c-format
msgid "%s points nowhere!"
msgstr ""
#: builtin/reflog.c:696
msgid "no reflog specified to delete"
msgstr ""
#: builtin/reflog.c:705
#, c-format
msgid "not a reflog: %s"
msgstr ""
#: builtin/reflog.c:710
#, c-format
msgid "no reflog for '%s'"
msgstr ""
#: builtin/reflog.c:756
#, c-format
msgid "invalid ref format: %s"
msgstr ""
#: builtin/reflog.c:765
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
#: builtin/remote.c:17
msgid "git remote [-v | --verbose]"
msgstr ""
#: builtin/remote.c:18
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
#: builtin/remote.c:19 builtin/remote.c:39
msgid "git remote rename <old> <new>"
msgstr ""
#: builtin/remote.c:20 builtin/remote.c:44
msgid "git remote remove <name>"
msgstr ""
#: builtin/remote.c:21 builtin/remote.c:49
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
#: builtin/remote.c:22
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
#: builtin/remote.c:23
msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
#: builtin/remote.c:24
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
#: builtin/remote.c:25
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
#: builtin/remote.c:26 builtin/remote.c:75
msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --delete <name> <url>"
msgstr ""
#: builtin/remote.c:34
msgid "git remote add [<options>] <name> <url>"
msgstr ""
#: builtin/remote.c:54
msgid "git remote set-branches <name> <branch>..."
msgstr ""
#: builtin/remote.c:55
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
#: builtin/remote.c:60
msgid "git remote show [<options>] <name>"
msgstr ""
#: builtin/remote.c:65
msgid "git remote prune [<options>] <name>"
msgstr ""
#: builtin/remote.c:70
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
#: builtin/remote.c:99
#, c-format
msgid "Updating %s"
msgstr ""
#: builtin/remote.c:131
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
#: builtin/remote.c:148
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
#: builtin/remote.c:164
msgid "fetch the remote branches"
msgstr ""
#: builtin/remote.c:166
msgid "import all tags and associated objects when fetching"
msgstr ""
#: builtin/remote.c:169
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
#: builtin/remote.c:171
msgid "branch(es) to track"
msgstr ""
#: builtin/remote.c:172
msgid "master branch"
msgstr ""
#: builtin/remote.c:174
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
#: builtin/remote.c:186
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
#: builtin/remote.c:188
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
#: builtin/remote.c:195 builtin/remote.c:696
#, c-format
msgid "remote %s already exists."
msgstr ""
#: builtin/remote.c:199 builtin/remote.c:700
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
#: builtin/remote.c:239
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
#: builtin/remote.c:354
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
#: builtin/remote.c:453 builtin/remote.c:461
msgid "(matching)"
msgstr ""
#: builtin/remote.c:465
msgid "(delete)"
msgstr ""
#: builtin/remote.c:653
#, c-format
msgid "could not set '%s'"
msgstr ""
#: builtin/remote.c:658
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
"\t%s:%d\n"
"now names the non-existent remote '%s'"
msgstr ""
#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
#, c-format
msgid "No such remote: '%s'"
msgstr ""
#: builtin/remote.c:706
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
#: builtin/remote.c:726
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
#: builtin/remote.c:766
#, c-format
msgid "deleting '%s' failed"
msgstr ""
#: builtin/remote.c:800
#, c-format
msgid "creating '%s' failed"
msgstr ""
#: builtin/remote.c:876
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgid_plural ""
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
"to delete them, use:"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:890
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
#: builtin/remote.c:993
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
#: builtin/remote.c:996
msgid " tracked"
msgstr ""
#: builtin/remote.c:998
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
#: builtin/remote.c:1000
msgid " ???"
msgstr ""
#: builtin/remote.c:1041
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
#: builtin/remote.c:1050
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
#: builtin/remote.c:1052
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
#: builtin/remote.c:1055
#, c-format
msgid "rebases onto remote %s"
msgstr ""
#: builtin/remote.c:1059
#, c-format
msgid " merges with remote %s"
msgstr ""
#: builtin/remote.c:1062
#, c-format
msgid "merges with remote %s"
msgstr ""
#: builtin/remote.c:1065
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
#: builtin/remote.c:1108
msgid "create"
msgstr ""
#: builtin/remote.c:1111
msgid "delete"
msgstr ""
#: builtin/remote.c:1115
msgid "up to date"
msgstr ""
#: builtin/remote.c:1118
msgid "fast-forwardable"
msgstr ""
#: builtin/remote.c:1121
msgid "local out of date"
msgstr ""
#: builtin/remote.c:1128
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
#: builtin/remote.c:1131
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
#: builtin/remote.c:1135
#, c-format
msgid " %-*s forces to %s"
msgstr ""
#: builtin/remote.c:1138
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
#: builtin/remote.c:1206
msgid "do not query remotes"
msgstr ""
#: builtin/remote.c:1233
#, c-format
msgid "* remote %s"
msgstr ""
#: builtin/remote.c:1234
#, c-format
msgid " Fetch URL: %s"
msgstr ""
#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
msgid "(no URL)"
msgstr ""
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
#.
#: builtin/remote.c:1249 builtin/remote.c:1251
#, c-format
msgid " Push URL: %s"
msgstr ""
#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " HEAD branch: %s"
msgstr ""
#: builtin/remote.c:1253
msgid "(not queried)"
msgstr ""
#: builtin/remote.c:1255
msgid "(unknown)"
msgstr ""
#: builtin/remote.c:1259
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
#: builtin/remote.c:1271
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1274 builtin/remote.c:1300
msgid " (status not queried)"
msgstr ""
#: builtin/remote.c:1283
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1291
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
#: builtin/remote.c:1297
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
#: builtin/remote.c:1318
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
#: builtin/remote.c:1320
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
#: builtin/remote.c:1335
msgid "Cannot determine remote HEAD"
msgstr ""
#: builtin/remote.c:1337
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
#: builtin/remote.c:1347
#, c-format
msgid "Could not delete %s"
msgstr ""
#: builtin/remote.c:1355
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
#: builtin/remote.c:1357
#, c-format
msgid "Could not setup %s"
msgstr ""
#: builtin/remote.c:1375
#, c-format
msgid " %s will become dangling!"
msgstr ""
#: builtin/remote.c:1376
#, c-format
msgid " %s has become dangling!"
msgstr ""
#: builtin/remote.c:1386
#, c-format
msgid "Pruning %s"
msgstr ""
#: builtin/remote.c:1387
#, c-format
msgid "URL: %s"
msgstr ""
#: builtin/remote.c:1403
#, c-format
msgid " * [would prune] %s"
msgstr ""
#: builtin/remote.c:1406
#, c-format
msgid " * [pruned] %s"
msgstr ""
#: builtin/remote.c:1451
msgid "prune remotes after fetching"
msgstr ""
#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
#, c-format
msgid "No such remote '%s'"
msgstr ""
#: builtin/remote.c:1530
msgid "add branch"
msgstr ""
#: builtin/remote.c:1537
msgid "no remote specified"
msgstr ""
#: builtin/remote.c:1554
msgid "query push URLs rather than fetch URLs"
msgstr ""
#: builtin/remote.c:1556
msgid "return all URLs"
msgstr ""
#: builtin/remote.c:1584
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
#: builtin/remote.c:1610
msgid "manipulate push URLs"
msgstr ""
#: builtin/remote.c:1612
msgid "add URL"
msgstr ""
#: builtin/remote.c:1614
msgid "delete URLs"
msgstr ""
#: builtin/remote.c:1621
msgid "--add --delete doesn't make sense"
msgstr ""
#: builtin/remote.c:1660
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
#: builtin/remote.c:1668
#, c-format
msgid "No such URL found: %s"
msgstr ""
#: builtin/remote.c:1670
msgid "Will not delete all non-push URLs"
msgstr ""
#: builtin/repack.c:23
msgid "git repack [<options>]"
msgstr ""
#: builtin/repack.c:28
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
#: builtin/repack.c:191
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
#: builtin/repack.c:230 builtin/repack.c:416
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
#: builtin/repack.c:254
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
#: builtin/repack.c:292
msgid "pack everything in a single pack"
msgstr ""
#: builtin/repack.c:294
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
#: builtin/repack.c:297
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
#: builtin/repack.c:299
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
#: builtin/repack.c:301
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
#: builtin/repack.c:303
msgid "do not run git-update-server-info"
msgstr ""
#: builtin/repack.c:306
msgid "pass --local to git-pack-objects"
msgstr ""
#: builtin/repack.c:308
msgid "write bitmap index"
msgstr ""
#: builtin/repack.c:310
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
#: builtin/repack.c:311
msgid "approxidate"
msgstr ""
#: builtin/repack.c:312
msgid "with -A, do not loosen objects older than this"
msgstr ""
#: builtin/repack.c:314
msgid "with -a, repack unreachable objects"
msgstr ""
#: builtin/repack.c:316
msgid "size of the window used for delta compression"
msgstr ""
#: builtin/repack.c:317 builtin/repack.c:323
msgid "bytes"
msgstr ""
#: builtin/repack.c:318
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
#: builtin/repack.c:320
msgid "limits the maximum delta depth"
msgstr ""
#: builtin/repack.c:322
msgid "limits the maximum number of threads"
msgstr ""
#: builtin/repack.c:324
msgid "maximum size of each packfile"
msgstr ""
#: builtin/repack.c:326
msgid "repack objects in packs marked with .keep"
msgstr ""
#: builtin/repack.c:328
msgid "do not repack this pack"
msgstr ""
#: builtin/repack.c:338
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
#: builtin/repack.c:342
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
#: builtin/repack.c:425
msgid "Nothing new to pack."
msgstr ""
#: builtin/repack.c:486
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: prefixing old- to their name, in order to\n"
"WARNING: replace them with the new version of the\n"
"WARNING: file. But the operation failed, and the\n"
"WARNING: attempt to rename them back to their\n"
"WARNING: original names also failed.\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
#: builtin/repack.c:534
#, c-format
msgid "failed to remove '%s'"
msgstr ""
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr ""
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr ""
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
#: builtin/replace.c:25
msgid "git replace [-f] --convert-graft-file"
msgstr ""
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr ""
#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr ""
#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr ""
#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr ""
#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr ""
#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
"'%s' points to a replaced object of type '%s'\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr ""
#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr ""
#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr ""
#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr ""
#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr ""
#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr ""
#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr ""
#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr ""
#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
#: builtin/replace.c:454
#, c-format
msgid "not a valid object name: '%s'"
msgstr ""
#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr ""
#: builtin/replace.c:342
msgid "editing object file failed"
msgstr ""
#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
#: builtin/replace.c:384
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
#: builtin/replace.c:418
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
#: builtin/replace.c:430
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
#: builtin/replace.c:469
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
#: builtin/replace.c:470
msgid "the signature will be removed in the replacement commit!"
msgstr ""
#: builtin/replace.c:480
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
#: builtin/replace.c:488
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
#: builtin/replace.c:492
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
#: builtin/replace.c:527
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
#: builtin/replace.c:548
msgid "list replace refs"
msgstr ""
#: builtin/replace.c:549
msgid "delete replace refs"
msgstr ""
#: builtin/replace.c:550
msgid "edit existing object"
msgstr ""
#: builtin/replace.c:551
msgid "change a commit's parents"
msgstr ""
#: builtin/replace.c:552
msgid "convert existing graft file"
msgstr ""
#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr ""
#: builtin/replace.c:555
msgid "do not pretty-print contents for --edit"
msgstr ""
#: builtin/replace.c:556
msgid "use this format"
msgstr ""
#: builtin/replace.c:569
msgid "--format cannot be used when not listing"
msgstr ""
#: builtin/replace.c:577
msgid "-f only makes sense when writing a replacement"
msgstr ""
#: builtin/replace.c:581
msgid "--raw only makes sense with --edit"
msgstr ""
#: builtin/replace.c:587
msgid "-d needs at least one argument"
msgstr ""
#: builtin/replace.c:593
msgid "bad number of arguments"
msgstr ""
#: builtin/replace.c:599
msgid "-e needs exactly one argument"
msgstr ""
#: builtin/replace.c:605
msgid "-g needs at least one argument"
msgstr ""
#: builtin/replace.c:611
msgid "--convert-graft-file takes no argument"
msgstr ""
#: builtin/replace.c:617
msgid "only one pattern can be given with -l"
msgstr ""
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr ""
#: builtin/rerere.c:79
msgid "'git rerere forget' without paths is deprecated"
msgstr ""
#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr ""
#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
msgstr ""
#: builtin/reset.c:34
msgid ""
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
#: builtin/reset.c:35
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
msgstr ""
#: builtin/reset.c:41
msgid "mixed"
msgstr ""
#: builtin/reset.c:41
msgid "soft"
msgstr ""
#: builtin/reset.c:41
msgid "hard"
msgstr ""
#: builtin/reset.c:41
msgid "merge"
msgstr ""
#: builtin/reset.c:41
msgid "keep"
msgstr ""
#: builtin/reset.c:82
msgid "You do not have a valid HEAD."
msgstr ""
#: builtin/reset.c:84
msgid "Failed to find tree of HEAD."
msgstr ""
#: builtin/reset.c:90
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
#: builtin/reset.c:115
#, c-format
msgid "HEAD is now at %s"
msgstr ""
#: builtin/reset.c:194
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr ""
#: builtin/reset.c:296
msgid "reset HEAD and index"
msgstr ""
#: builtin/reset.c:297
msgid "reset only HEAD"
msgstr ""
#: builtin/reset.c:299 builtin/reset.c:301
msgid "reset HEAD, index and working tree"
msgstr ""
#: builtin/reset.c:303
msgid "reset HEAD but keep local changes"
msgstr ""
#: builtin/reset.c:309
msgid "record only the fact that removed paths will be added later"
msgstr ""
#: builtin/reset.c:343
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
#: builtin/reset.c:351
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
#: builtin/reset.c:360
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
#: builtin/reset.c:370
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
#: builtin/reset.c:372
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
#: builtin/reset.c:387
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
#: builtin/reset.c:391
msgid "-N can only be used with --mixed"
msgstr ""
#: builtin/reset.c:412
msgid "Unstaged changes after reset:"
msgstr ""
#: builtin/reset.c:415
#, c-format
msgid ""
"\n"
"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
"to make this the default.\n"
msgstr ""
#: builtin/reset.c:425
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
#: builtin/reset.c:429
msgid "Could not write new index file."
msgstr ""
#: builtin/rev-list.c:499
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
#: builtin/rev-list.c:560
msgid "object filtering requires --objects"
msgstr ""
#: builtin/rev-list.c:610
msgid "rev-list does not support display of notes"
msgstr ""
#: builtin/rev-list.c:615
msgid "marked counting is incompatible with --objects"
msgstr ""
#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr ""
#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr ""
#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr ""
#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr ""
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr ""
#: builtin/revert.c:72
#, c-format
msgid "option `%s' expects a number greater than zero"
msgstr ""
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr ""
#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr ""
#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr ""
#: builtin/revert.c:105
msgid "skip current commit and continue"
msgstr ""
#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr ""
#: builtin/revert.c:108
msgid "edit the commit message"
msgstr ""
#: builtin/revert.c:111
msgid "parent-number"
msgstr ""
#: builtin/revert.c:112
msgid "select mainline parent"
msgstr ""
#: builtin/revert.c:114
msgid "merge strategy"
msgstr ""
#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr ""
#: builtin/revert.c:125
msgid "append commit name"
msgstr ""
#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr ""
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr ""
#: builtin/revert.c:232
msgid "revert failed"
msgstr ""
#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr ""
#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr ""
#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgid_plural ""
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
#: builtin/rm.c:243
msgid "do not list removed files"
msgstr ""
#: builtin/rm.c:244
msgid "only remove from the index"
msgstr ""
#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr ""
#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr ""
#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
msgstr ""
#: builtin/rm.c:282
msgid "No pathspec was given. Which files should I remove?"
msgstr ""
#: builtin/rm.c:305
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
#: builtin/rm.c:323
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
#: builtin/rm.c:362
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
"[<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
#: builtin/send-pack.c:163
msgid "remote name"
msgstr ""
#: builtin/send-pack.c:177
msgid "use stateless RPC protocol"
msgstr ""
#: builtin/send-pack.c:178
msgid "read refs from stdin"
msgstr ""
#: builtin/send-pack.c:179
msgid "print status from remote helper"
msgstr ""
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
#: builtin/shortlog.c:15
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgstr ""
#: builtin/shortlog.c:266
msgid "sort output according to the number of commits per author"
msgstr ""
#: builtin/shortlog.c:268
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
#: builtin/shortlog.c:270
msgid "Show the email address of each author"
msgstr ""
#: builtin/shortlog.c:271
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr ""
#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
#: builtin/show-branch.c:395
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] ""
msgstr[1] ""
#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr ""
#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr ""
#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr ""
#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr ""
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr ""
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr ""
#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr ""
#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr ""
#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr ""
#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr ""
#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr ""
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr ""
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr ""
#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr ""
#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr ""
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr ""
#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] ""
msgstr[1] ""
#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr ""
#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr ""
#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr ""
#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr ""
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr ""
#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
#: builtin/sparse-checkout.c:21
msgid "git sparse-checkout (init|list|set|add|disable) <options>"
msgstr ""
#: builtin/sparse-checkout.c:64
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
#: builtin/sparse-checkout.c:225
msgid "failed to create directory for sparse-checkout file"
msgstr ""
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
#: builtin/sparse-checkout.c:283
msgid "git sparse-checkout init [--cone]"
msgstr ""
#: builtin/sparse-checkout.c:302
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
#: builtin/sparse-checkout.c:308
msgid "initialize sparse-checkout"
msgstr ""
#: builtin/sparse-checkout.c:341
#, c-format
msgid "failed to open '%s'"
msgstr ""
#: builtin/sparse-checkout.c:398
#, c-format
msgid "could not normalize path %s"
msgstr ""
#: builtin/sparse-checkout.c:410
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
#: builtin/sparse-checkout.c:435
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
#: builtin/sparse-checkout.c:558
msgid "read patterns from standard in"
msgstr ""
#: builtin/sparse-checkout.c:564
msgid "set sparse-checkout patterns"
msgstr ""
#: builtin/sparse-checkout.c:581
msgid "disable sparse-checkout"
msgstr ""
#: builtin/sparse-checkout.c:593
msgid "error while refreshing working directory"
msgstr ""
#: builtin/stash.c:22 builtin/stash.c:38
msgid "git stash list [<options>]"
msgstr ""
#: builtin/stash.c:23 builtin/stash.c:43
msgid "git stash show [<options>] [<stash>]"
msgstr ""
#: builtin/stash.c:24 builtin/stash.c:48
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:25
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:26 builtin/stash.c:63
msgid "git stash branch <branchname> [<stash>]"
msgstr ""
#: builtin/stash.c:27 builtin/stash.c:68
msgid "git stash clear"
msgstr ""
#: builtin/stash.c:28
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
#: builtin/stash.c:32 builtin/stash.c:85
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
#: builtin/stash.c:53
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:58
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
#: builtin/stash.c:73
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr ""
#: builtin/stash.c:78
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr ""
#: builtin/stash.c:148
#, c-format
msgid "Too many revisions specified:%s"
msgstr ""
#: builtin/stash.c:162 git-legacy-stash.sh:549
msgid "No stash entries found."
msgstr ""
#: builtin/stash.c:176
#, c-format
msgid "%s is not a valid reference"
msgstr ""
#: builtin/stash.c:225 git-legacy-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr ""
#: builtin/stash.c:404
msgid "cannot apply a stash in the middle of a merge"
msgstr ""
#: builtin/stash.c:415
#, c-format
msgid "could not generate diff %s^!."
msgstr ""
#: builtin/stash.c:422
msgid "conflicts in index.Try without --index."
msgstr ""
#: builtin/stash.c:428
msgid "could not save index tree"
msgstr ""
#: builtin/stash.c:437
msgid "could not restore untracked files from stash"
msgstr ""
#: builtin/stash.c:451
#, c-format
msgid "Merging %s with %s"
msgstr ""
#: builtin/stash.c:461 git-legacy-stash.sh:681
msgid "Index was not unstashed."
msgstr ""
#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr ""
#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
#: builtin/stash.c:633 git-legacy-stash.sh:695
msgid "The stash entry is kept in case you need it again."
msgstr ""
#: builtin/stash.c:656 git-legacy-stash.sh:713
msgid "No branch name specified"
msgstr ""
#: builtin/stash.c:796 builtin/stash.c:833
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
msgid "stash message"
msgstr ""
#: builtin/stash.c:824
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
#: builtin/stash.c:1049 git-legacy-stash.sh:218
msgid "No changes selected"
msgstr ""
#: builtin/stash.c:1149 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr ""
#: builtin/stash.c:1176 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr ""
#: builtin/stash.c:1185 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr ""
#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
#: git-legacy-stash.sh:214
msgid "Cannot save the current worktree state"
msgstr ""
#: builtin/stash.c:1233 git-legacy-stash.sh:234
msgid "Cannot record working tree state"
msgstr ""
#: builtin/stash.c:1282 git-legacy-stash.sh:338
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
#: builtin/stash.c:1298
msgid "Did you forget to 'git add'?"
msgstr ""
#: builtin/stash.c:1313 git-legacy-stash.sh:346
msgid "No local changes to save"
msgstr ""
#: builtin/stash.c:1320 git-legacy-stash.sh:351
msgid "Cannot initialize stash"
msgstr ""
#: builtin/stash.c:1335 git-legacy-stash.sh:355
msgid "Cannot save the current status"
msgstr ""
#: builtin/stash.c:1340
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
#: builtin/stash.c:1430 git-legacy-stash.sh:385
msgid "Cannot remove worktree changes"
msgstr ""
#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "keep index"
msgstr ""
#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash in patch mode"
msgstr ""
#: builtin/stash.c:1472 builtin/stash.c:1537
msgid "quiet mode"
msgstr ""
#: builtin/stash.c:1474 builtin/stash.c:1539
msgid "include untracked files in stash"
msgstr ""
#: builtin/stash.c:1476 builtin/stash.c:1541
msgid "include ignore files"
msgstr ""
#: builtin/stash.c:1600
#, c-format
msgid "could not exec %s"
msgstr ""
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr ""
#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr ""
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr ""
#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
#: builtin/submodule--helper.c:64
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
#: builtin/submodule--helper.c:102
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
msgid "alternative anchor for relative paths"
msgstr ""
#: builtin/submodule--helper.c:415
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
#: builtin/submodule--helper.c:653
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
#: builtin/submodule--helper.c:524
#, c-format
msgid "Entering '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:527
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
#: builtin/submodule--helper.c:549
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"submodules of %s\n"
"."
msgstr ""
#: builtin/submodule--helper.c:565
msgid "Suppress output of entering each submodule command"
msgstr ""
#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
msgid "Recurse into nested submodules"
msgstr ""
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
#: builtin/submodule--helper.c:599
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
#: builtin/submodule--helper.c:667
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
#: builtin/submodule--helper.c:671
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:681
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:688
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
#: builtin/submodule--helper.c:710
msgid "Suppress output for initializing a submodule"
msgstr ""
#: builtin/submodule--helper.c:715
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
#: builtin/submodule--helper.c:837
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
msgid "Suppress submodule status output"
msgstr ""
#: builtin/submodule--helper.c:889
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
#: builtin/submodule--helper.c:890
msgid "recurse into nested submodules"
msgstr ""
#: builtin/submodule--helper.c:895
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
#: builtin/submodule--helper.c:919
msgid "git submodule--helper name <path>"
msgstr ""
#: builtin/submodule--helper.c:983
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
#: builtin/submodule--helper.c:1003
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:1014
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:1061
msgid "Suppress output of synchronizing submodule url"
msgstr ""
#: builtin/submodule--helper.c:1068
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
#: builtin/submodule--helper.c:1122
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
#: builtin/submodule--helper.c:1134
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
#: builtin/submodule--helper.c:1142
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:1144
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:1155
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
#: builtin/submodule--helper.c:1171
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
#: builtin/submodule--helper.c:1200
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
#: builtin/submodule--helper.c:1201
msgid "Unregister all submodules"
msgstr ""
#: builtin/submodule--helper.c:1206
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
#: builtin/submodule--helper.c:1220
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
#: builtin/submodule--helper.c:1289
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
"'--reference-if-able' instead of '--reference'."
msgstr ""
#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
#: builtin/submodule--helper.c:1367
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
#: builtin/submodule--helper.c:1374
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
#: builtin/submodule--helper.c:1398
msgid "where the new submodule will be cloned to"
msgstr ""
#: builtin/submodule--helper.c:1401
msgid "name of the new submodule"
msgstr ""
#: builtin/submodule--helper.c:1404
msgid "url where to clone the submodule from"
msgstr ""
#: builtin/submodule--helper.c:1412
msgid "depth for shallow clones"
msgstr ""
#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
msgid "force cloning progress"
msgstr ""
#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
msgid "disallow cloning into non-empty directory"
msgstr ""
#: builtin/submodule--helper.c:1424
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
msgstr ""
#: builtin/submodule--helper.c:1449
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
#: builtin/submodule--helper.c:1460
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
#: builtin/submodule--helper.c:1464
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
#: builtin/submodule--helper.c:1476
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
#: builtin/submodule--helper.c:1512
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
#: builtin/submodule--helper.c:1516
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
#: builtin/submodule--helper.c:1617
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
#: builtin/submodule--helper.c:1621
msgid "Maybe you want to use 'update --init'?"
msgstr ""
#: builtin/submodule--helper.c:1651
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
#: builtin/submodule--helper.c:1680
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:1830
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
#: builtin/submodule--helper.c:1841
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
msgid "path into the working tree"
msgstr ""
#: builtin/submodule--helper.c:1906
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
#: builtin/submodule--helper.c:1910
msgid "rebase, merge, checkout or none"
msgstr ""
#: builtin/submodule--helper.c:1916
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
#: builtin/submodule--helper.c:1919
msgid "parallel jobs"
msgstr ""
#: builtin/submodule--helper.c:1921
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
#: builtin/submodule--helper.c:1922
msgid "don't print cloning progress"
msgstr ""
#: builtin/submodule--helper.c:1933
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
#: builtin/submodule--helper.c:1946
msgid "bad value for update parameter"
msgstr ""
#: builtin/submodule--helper.c:1994
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
#: builtin/submodule--helper.c:2117
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
#: builtin/submodule--helper.c:2150
msgid "recurse into submodules"
msgstr ""
#: builtin/submodule--helper.c:2156
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
#: builtin/submodule--helper.c:2212
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
#: builtin/submodule--helper.c:2215
msgid "unset the config in the .gitmodules file"
msgstr ""
#: builtin/submodule--helper.c:2220
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
#: builtin/submodule--helper.c:2221
msgid "git submodule--helper config --unset <name>"
msgstr ""
#: builtin/submodule--helper.c:2222
msgid "git submodule--helper config --check-writeable"
msgstr ""
#: builtin/submodule--helper.c:2241 git-submodule.sh:174
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
#: builtin/submodule--helper.c:2297
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr ""
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr ""
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr ""
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr ""
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
msgstr ""
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr ""
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr ""
#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
msgstr ""
#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr ""
#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr ""
#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
#: builtin/tag.c:232
msgid "bad object type."
msgstr ""
#: builtin/tag.c:284
msgid "no tag message?"
msgstr ""
#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
#: builtin/tag.c:402
msgid "list tag names"
msgstr ""
#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr ""
#: builtin/tag.c:406
msgid "delete tags"
msgstr ""
#: builtin/tag.c:407
msgid "verify tags"
msgstr ""
#: builtin/tag.c:409
msgid "Tag creation options"
msgstr ""
#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr ""
#: builtin/tag.c:413
msgid "tag message"
msgstr ""
#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr ""
#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr ""
#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr ""
#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr ""
#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
#: builtin/tag.c:423
msgid "Tag listing options"
msgstr ""
#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr ""
#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr ""
#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr ""
#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr ""
#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr ""
#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr ""
#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr ""
#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr ""
#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr ""
#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr ""
#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr ""
#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr ""
#: builtin/tag.c:542
msgid "too many params"
msgstr ""
#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr ""
#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
#: builtin/unpack-objects.c:502
msgid "Unpacking objects"
msgstr ""
#: builtin/update-index.c:84
#, c-format
msgid "failed to create directory %s"
msgstr ""
#: builtin/update-index.c:100
#, c-format
msgid "failed to create file %s"
msgstr ""
#: builtin/update-index.c:108
#, c-format
msgid "failed to delete file %s"
msgstr ""
#: builtin/update-index.c:115 builtin/update-index.c:221
#, c-format
msgid "failed to delete directory %s"
msgstr ""
#: builtin/update-index.c:140
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
#: builtin/update-index.c:154
msgid "directory stat info does not change after adding a new file"
msgstr ""
#: builtin/update-index.c:167
msgid "directory stat info does not change after adding a new directory"
msgstr ""
#: builtin/update-index.c:180
msgid "directory stat info changes after updating a file"
msgstr ""
#: builtin/update-index.c:191
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
#: builtin/update-index.c:202
msgid "directory stat info does not change after deleting a file"
msgstr ""
#: builtin/update-index.c:215
msgid "directory stat info does not change after deleting a directory"
msgstr ""
#: builtin/update-index.c:222
msgid " OK"
msgstr ""
#: builtin/update-index.c:591
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
#: builtin/update-index.c:974
msgid "continue refresh even when index needs update"
msgstr ""
#: builtin/update-index.c:977
msgid "refresh: ignore submodules"
msgstr ""
#: builtin/update-index.c:980
msgid "do not ignore new files"
msgstr ""
#: builtin/update-index.c:982
msgid "let files replace directories and vice-versa"
msgstr ""
#: builtin/update-index.c:984
msgid "notice files missing from worktree"
msgstr ""
#: builtin/update-index.c:986
msgid "refresh even if index contains unmerged entries"
msgstr ""
#: builtin/update-index.c:989
msgid "refresh stat information"
msgstr ""
#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
msgstr ""
#: builtin/update-index.c:998
msgid "add the specified entry to the index"
msgstr ""
#: builtin/update-index.c:1008
msgid "mark files as \"not changing\""
msgstr ""
#: builtin/update-index.c:1011
msgid "clear assumed-unchanged bit"
msgstr ""
#: builtin/update-index.c:1014
msgid "mark files as \"index-only\""
msgstr ""
#: builtin/update-index.c:1017
msgid "clear skip-worktree bit"
msgstr ""
#: builtin/update-index.c:1020
msgid "do not touch index-only entries"
msgstr ""
#: builtin/update-index.c:1022
msgid "add to index only; do not add content to object database"
msgstr ""
#: builtin/update-index.c:1024
msgid "remove named paths even if present in worktree"
msgstr ""
#: builtin/update-index.c:1026
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
#: builtin/update-index.c:1028
msgid "read list of paths to be updated from standard input"
msgstr ""
#: builtin/update-index.c:1032
msgid "add entries from standard input to the index"
msgstr ""
#: builtin/update-index.c:1036
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
#: builtin/update-index.c:1040
msgid "only update entries that differ from HEAD"
msgstr ""
#: builtin/update-index.c:1044
msgid "ignore files missing from worktree"
msgstr ""
#: builtin/update-index.c:1047
msgid "report actions to standard output"
msgstr ""
#: builtin/update-index.c:1049
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
#: builtin/update-index.c:1053
msgid "write index in this format"
msgstr ""
#: builtin/update-index.c:1055
msgid "enable or disable split index"
msgstr ""
#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
msgstr ""
#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
msgstr ""
#: builtin/update-index.c:1061
msgid "enable untracked cache without testing the filesystem"
msgstr ""
#: builtin/update-index.c:1063
msgid "write out the index even if is not flagged as changed"
msgstr ""
#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
msgstr ""
#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
msgstr ""
#: builtin/update-index.c:1070
msgid "clear fsmonitor valid bit"
msgstr ""
#: builtin/update-index.c:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
msgstr ""
#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
#: builtin/update-index.c:1210
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
#: builtin/update-index.c:1218
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
msgstr ""
#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
msgstr ""
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr ""
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr ""
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr ""
#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr ""
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr ""
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr ""
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr ""
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr ""
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr ""
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr ""
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr ""
#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
#: builtin/verify-pack.c:65
msgid "verbose"
msgstr ""
#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr ""
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr ""
#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr ""
#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr ""
#: builtin/worktree.c:20
msgid "git worktree move <worktree> <new-path>"
msgstr ""
#: builtin/worktree.c:21
msgid "git worktree prune [<options>]"
msgstr ""
#: builtin/worktree.c:22
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
#: builtin/worktree.c:23
msgid "git worktree unlock <path>"
msgstr ""
#: builtin/worktree.c:60 builtin/worktree.c:891
#, c-format
msgid "failed to delete '%s'"
msgstr ""
#: builtin/worktree.c:79
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
#: builtin/worktree.c:85
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
#: builtin/worktree.c:90 builtin/worktree.c:99
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
#: builtin/worktree.c:109
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
#: builtin/worktree.c:117
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
#: builtin/worktree.c:126
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
#: builtin/worktree.c:165
msgid "report pruned working trees"
msgstr ""
#: builtin/worktree.c:167
msgid "expire working trees older than <time>"
msgstr ""
#: builtin/worktree.c:234
#, c-format
msgid "'%s' already exists"
msgstr ""
#: builtin/worktree.c:244
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr ""
#: builtin/worktree.c:249
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
#: builtin/worktree.c:251
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
#: builtin/worktree.c:301
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
#: builtin/worktree.c:434
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
#: builtin/worktree.c:443
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
#: builtin/worktree.c:449
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
#: builtin/worktree.c:493
msgid "create a new branch"
msgstr ""
#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr ""
#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr ""
#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr ""
#: builtin/worktree.c:501
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
#: builtin/worktree.c:504
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
#: builtin/worktree.c:573
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
#: builtin/worktree.c:673
msgid "reason for locking"
msgstr ""
#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
#: builtin/worktree.c:919
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr ""
#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr ""
#: builtin/worktree.c:763
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
#: builtin/worktree.c:771
msgid "force move even if worktree is dirty or locked"
msgstr ""
#: builtin/worktree.c:794 builtin/worktree.c:921
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
#: builtin/worktree.c:799
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
#: builtin/worktree.c:805
#, c-format
msgid "target '%s' already exists"
msgstr ""
#: builtin/worktree.c:813
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
#: builtin/worktree.c:815
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
#: builtin/worktree.c:818
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
#: builtin/worktree.c:823
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
#: builtin/worktree.c:871
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
#: builtin/worktree.c:875
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
#: builtin/worktree.c:880
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
#: builtin/worktree.c:903
msgid "force removal even if worktree is dirty or locked"
msgstr ""
#: builtin/worktree.c:926
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
#: builtin/worktree.c:928
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
#: builtin/worktree.c:931
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr ""
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr ""
#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr ""
#: fast-import.c:3125
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
#: fast-import.c:3130
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
#: fast-import.c:3254
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"users may be able to read your cached credentials. Consider running:\n"
"\n"
"\tchmod 0700 %s"
msgstr ""
#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr ""
#: t/helper/test-reach.c:152
#, c-format
msgid "commit %s is not marked reachable"
msgstr ""
#: t/helper/test-reach.c:162
msgid "too many commits marked reachable"
msgstr ""
#: t/helper/test-serve-v2.c:7
msgid "test-tool serve-v2 [<options>]"
msgstr ""
#: t/helper/test-serve-v2.c:19
msgid "exit immediately after advertising capabilities"
msgstr ""
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]"
msgstr ""
#: git.c:34
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept.\n"
"See 'git help git' for an overview of the system."
msgstr ""
#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr ""
#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr ""
#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
#: git.c:376
#, c-format
msgid "empty alias for %s"
msgstr ""
#: git.c:379
#, c-format
msgid "recursive alias: %s"
msgstr ""
#: git.c:459
msgid "write failure on standard output"
msgstr ""
#: git.c:461
msgid "unknown write failure on standard output"
msgstr ""
#: git.c:463
msgid "close failed on standard output"
msgstr ""
#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
#: http.c:1086
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
#: http.c:1093
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
#: http.c:1097
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
#: http.c:1966
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" asked for: %s\n"
" redirect: %s"
msgstr ""
#: remote-curl.c:166
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
#: remote-curl.c:263
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
#: remote-curl.c:364
msgid "invalid server response; expected service, got flush packet"
msgstr ""
#: remote-curl.c:395
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
#: remote-curl.c:455
#, c-format
msgid "repository '%s' not found"
msgstr ""
#: remote-curl.c:459
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
#: remote-curl.c:463
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
#: remote-curl.c:469
#, c-format
msgid "redirecting to %s"
msgstr ""
#: remote-curl.c:593
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
#: remote-curl.c:673
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
#: remote-curl.c:733
#, c-format
msgid "RPC failed; %s"
msgstr ""
#: remote-curl.c:773
msgid "cannot handle pushes this big"
msgstr ""
#: remote-curl.c:888
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
#: remote-curl.c:892
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
#: remote-curl.c:1023
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
#: remote-curl.c:1038
msgid "fetch failed."
msgstr ""
#: remote-curl.c:1086
msgid "cannot fetch by sha1 over smart http"
msgstr ""
#: remote-curl.c:1130 remote-curl.c:1136
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
#: remote-curl.c:1148 remote-curl.c:1263
#, c-format
msgid "http transport does not support %s"
msgstr ""
#: remote-curl.c:1184
msgid "git-http-push failed"
msgstr ""
#: remote-curl.c:1369
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
#: remote-curl.c:1401
msgid "remote-curl: error reading command stream from git"
msgstr ""
#: remote-curl.c:1408
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
#: remote-curl.c:1448
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
#: list-objects-filter-options.h:85
msgid "args"
msgstr ""
#: list-objects-filter-options.h:86
msgid "object filtering"
msgstr ""
#: parse-options.h:183
msgid "expiry-date"
msgstr ""
#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr ""
#: parse-options.h:309
msgid "be more verbose"
msgstr ""
#: parse-options.h:311
msgid "be more quiet"
msgstr ""
#: parse-options.h:317
msgid "use <n> digits to display SHA-1s"
msgstr ""
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
msgstr ""
#: parse-options.h:337
msgid "read pathspec from file"
msgstr ""
#: parse-options.h:338
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
#: ref-filter.h:101
msgid "key"
msgstr ""
#: ref-filter.h:101
msgid "field name to sort on"
msgstr ""
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
#: wt-status.h:67
msgid "HEAD detached at "
msgstr ""
#: wt-status.h:68
msgid "HEAD detached from "
msgstr ""
#: command-list.h:50
msgid "Add file contents to the index"
msgstr ""
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr ""
#: command-list.h:52
msgid "Annotate file lines with commit information"
msgstr ""
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
msgstr ""
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr ""
#: command-list.h:55
msgid "Create an archive of files from a named tree"
msgstr ""
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
msgstr ""
#: command-list.h:58
msgid "List, create, or delete branches"
msgstr ""
#: command-list.h:59
msgid "Move objects and refs by archive"
msgstr ""
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr ""
#: command-list.h:61
msgid "Display gitattributes information"
msgstr ""
#: command-list.h:62
msgid "Debug gitignore / exclude files"
msgstr ""
#: command-list.h:63
msgid "Show canonical names and email addresses of contacts"
msgstr ""
#: command-list.h:64
msgid "Switch branches or restore working tree files"
msgstr ""
#: command-list.h:65
msgid "Copy files from the index to the working tree"
msgstr ""
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
msgstr ""
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
msgstr ""
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
msgstr ""
#: command-list.h:69
msgid "Graphical alternative to git-commit"
msgstr ""
#: command-list.h:70
msgid "Remove untracked files from the working tree"
msgstr ""
#: command-list.h:71
msgid "Clone a repository into a new directory"
msgstr ""
#: command-list.h:72
msgid "Display data in columns"
msgstr ""
#: command-list.h:73
msgid "Record changes to the repository"
msgstr ""
#: command-list.h:74
msgid "Write and verify Git commit-graph files"
msgstr ""
#: command-list.h:75
msgid "Create a new commit object"
msgstr ""
#: command-list.h:76
msgid "Get and set repository or global options"
msgstr ""
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
#: command-list.h:78
msgid "Retrieve and store user credentials"
msgstr ""
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
msgstr ""
#: command-list.h:80
msgid "Helper to store credentials on disk"
msgstr ""
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
msgstr ""
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
#: command-list.h:83
msgid "A CVS server emulator for Git"
msgstr ""
#: command-list.h:84
msgid "A really simple server for Git repositories"
msgstr ""
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
msgstr ""
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
#: command-list.h:87
msgid "Compares files in the working tree and the index"
msgstr ""
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
msgstr ""
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
#: command-list.h:90
msgid "Show changes using common diff tools"
msgstr ""
#: command-list.h:91
msgid "Git data exporter"
msgstr ""
#: command-list.h:92
msgid "Backend for fast Git data importers"
msgstr ""
#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr ""
#: command-list.h:94
msgid "Receive missing objects from another repository"
msgstr ""
#: command-list.h:95
msgid "Rewrite branches"
msgstr ""
#: command-list.h:96
msgid "Produce a merge commit message"
msgstr ""
#: command-list.h:97
msgid "Output information on each ref"
msgstr ""
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
msgstr ""
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
#: command-list.h:102
msgid "Print lines matching a pattern"
msgstr ""
#: command-list.h:103
msgid "A portable graphical interface to Git"
msgstr ""
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
#: command-list.h:105
msgid "Display help information about Git"
msgstr ""
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:107
msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:108
msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
msgstr ""
#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
msgstr ""
#: command-list.h:113
msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
msgid "The Git repository browser"
msgstr ""
#: command-list.h:115
msgid "Show commit logs"
msgstr ""
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:117
msgid "List references in a remote repository"
msgstr ""
#: command-list.h:118
msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:121
msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:123
msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:124
msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
#: command-list.h:127
msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:128
msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:129
msgid "Creates a tag object"
msgstr ""
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:132
msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:133
msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:135
msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:136
msgid "Find redundant pack files"
msgstr ""
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:138
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
#: command-list.h:139
msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:141
msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:144
msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:145
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:146
msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:147
msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:148
msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:149
msgid "Manage reflog information"
msgstr ""
#: command-list.h:150
msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:151
msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:152
msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:153
msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:154
msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:156
msgid "Restore working tree files"
msgstr ""
#: command-list.h:157
msgid "Revert some existing commits"
msgstr ""
#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:165
msgid "Show various types of objects"
msgstr ""
#: command-list.h:166
msgid "Show branches and their commits"
msgstr ""
#: command-list.h:167
msgid "Show packed archive index"
msgstr ""
#: command-list.h:168
msgid "List references in a local repository"
msgstr ""
#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:171
msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:172
msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:173
msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:174
msgid "Show the working tree status"
msgstr ""
#: command-list.h:175
msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:176
msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:177
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:178
msgid "Switch branches"
msgstr ""
#: command-list.h:179
msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:180
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:181
msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:182
msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:183
msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:184
msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:185
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:186
msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:187
msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:188
msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:189
msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:190
msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:191
msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:192
msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:193
msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:194
msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:195
msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:196
msgid "Defining attributes per path"
msgstr ""
#: command-list.h:197
msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:198
msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:199
msgid "Git for CVS users"
msgstr ""
#: command-list.h:200
msgid "Tweaking diff output"
msgstr ""
#: command-list.h:201
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:202
msgid "A Git Glossary"
msgstr ""
#: command-list.h:203
msgid "Hooks used by Git"
msgstr ""
#: command-list.h:204
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:205
msgid "Defining submodule properties"
msgstr ""
#: command-list.h:206
msgid "Git namespaces"
msgstr ""
#: command-list.h:207
msgid "Git Repository Layout"
msgstr ""
#: command-list.h:208
msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:209
msgid "Mounting one repository inside another"
msgstr ""
#: command-list.h:210
msgid "A tutorial introduction to Git: part two"
msgstr ""
#: command-list.h:211
msgid "A tutorial introduction to Git"
msgstr ""
#: command-list.h:212
msgid "An overview of recommended workflows with Git"
msgstr ""
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
#: git-bisect.sh:292
msgid "bisect run success"
msgstr ""
#: git-bisect.sh:300
msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
msgstr ""
#: git-merge-octopus.sh:62
msgid "Should not be doing an octopus."
msgstr ""
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:77
#, sh-format
msgid "Already up to date with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
msgstr ""
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
#: git-legacy-stash.sh:221
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
#: git-legacy-stash.sh:272
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
#: git-legacy-stash.sh:324
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
#: git-legacy-stash.sh:356
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
#: git-legacy-stash.sh:536
#, sh-format
msgid "unknown option: $opt"
msgstr ""
#: git-legacy-stash.sh:556
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
#: git-legacy-stash.sh:571
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
#: git-legacy-stash.sh:599
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
#: git-legacy-stash.sh:610
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
#: git-legacy-stash.sh:618
msgid "unable to refresh index"
msgstr ""
#: git-legacy-stash.sh:622
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
#: git-legacy-stash.sh:630
msgid "Conflicts in index. Try without --index."
msgstr ""
#: git-legacy-stash.sh:632
msgid "Could not save index tree"
msgstr ""
#: git-legacy-stash.sh:641
msgid "Could not restore untracked files from stash entry"
msgstr ""
#: git-legacy-stash.sh:666
msgid "Cannot unstage modified files"
msgstr ""
#: git-legacy-stash.sh:704
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
#: git-legacy-stash.sh:705
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
#: git-legacy-stash.sh:792
msgid "(To restore them type \"git stash apply\")"
msgstr ""
#: git-submodule.sh:203
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
#: git-submodule.sh:213
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
#: git-submodule.sh:235
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
#: git-submodule.sh:242
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr ""
#: git-submodule.sh:273
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
#: git-submodule.sh:275
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
#: git-submodule.sh:283
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
#: git-submodule.sh:285
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" $realrepo\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
#: git-submodule.sh:291
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
#: git-submodule.sh:303
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:308
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:317
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
#: git-submodule.sh:590
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:600
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
#: git-submodule.sh:605
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
#: git-submodule.sh:623
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
#: git-submodule.sh:629
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
#: git-submodule.sh:636
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
#: git-submodule.sh:641
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:642
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
#: git-submodule.sh:647
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:648
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
#: git-submodule.sh:653
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:654
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
#: git-submodule.sh:685
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
#: git-submodule.sh:896
msgid "The --cached option cannot be used with the --files option"
msgstr ""
#: git-submodule.sh:948
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
#: git-submodule.sh:968
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
#: git-submodule.sh:971
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
#: git-submodule.sh:974
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr ""
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr ""
#: git-rebase--preserve-merges.sh:112
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <commit> = run command (the rest of the line) using shell\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr ""
#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"This is most likely due to an empty commit message, or the pre-commit hook\n"
"failed. If the pre-commit hook failed, you may need to resolve the issue "
"before\n"
"you are able to reword the commit."
msgstr ""
#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr ""
#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr ""
#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"If these changes are meant to be\n"
"squashed into the previous commit, run:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr ""
#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr ""
#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr ""
#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr ""
#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
#: git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr ""
#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr ""
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr ""
#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr ""
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
#: git-add--interactive.perl:212
#, perl-format
msgid "%12s %12s %s"
msgstr ""
#: git-add--interactive.perl:634
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
#: git-add--interactive.perl:1053
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
#: git-add--interactive.perl:1074
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
#: git-add--interactive.perl:1111
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
#: git-add--interactive.perl:1118
#, perl-format
msgid ""
"---\n"
"To remove '%s' lines, make them ' ' lines (context).\n"
"To remove '%s' lines, delete them.\n"
"Lines starting with %s will be removed.\n"
msgstr ""
#: git-add--interactive.perl:1140
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
#: git-add--interactive.perl:1248
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"q - quit; do not stage this hunk or any of the remaining ones\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1254
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"q - quit; do not stash this hunk or any of the remaining ones\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1260
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"q - quit; do not unstage this hunk or any of the remaining ones\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1266
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1278
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1284
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1296
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
#: git-add--interactive.perl:1311
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"k - leave this hunk undecided, see previous undecided hunk\n"
"K - leave this hunk undecided, see previous hunk\n"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
#: git-add--interactive.perl:1342
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
#: git-add--interactive.perl:1357
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
#: git-add--interactive.perl:1468
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: git-add--interactive.perl:1469
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: git-add--interactive.perl:1470
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
#: git-add--interactive.perl:1570
msgid "No other hunks to goto\n"
msgstr ""
#: git-add--interactive.perl:1588
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
#: git-add--interactive.perl:1593
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
#: git-add--interactive.perl:1619
msgid "No other hunks to search\n"
msgstr ""
#: git-add--interactive.perl:1636
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
#: git-add--interactive.perl:1646
msgid "No hunk matches the given pattern\n"
msgstr ""
#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
msgid "No previous hunk\n"
msgstr ""
#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
msgid "No next hunk\n"
msgstr ""
#: git-add--interactive.perl:1692
msgid "Sorry, cannot split this hunk\n"
msgstr ""
#: git-add--interactive.perl:1698
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
#: git-add--interactive.perl:1708
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
#: git-add--interactive.perl:1773
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
msgid "missing --"
msgstr ""
#: git-add--interactive.perl:1821
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
"to produce patches for. Please disambiguate by...\n"
"\n"
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr ""
#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"for the patch you are writing.\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" send-email prompts before sending whenever this occurs.\n"
" This behavior is controlled by the sendemail.confirm\n"
" configuration setting.\n"
"\n"
" For additional information, run 'git send-email --help'.\n"
" To retain the current behavior, but squelch this message,\n"
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr ""
#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr ""
#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr ""
#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr ""
#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr ""
#: git-send-email.perl:1591
msgid "Result: "
msgstr ""
#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr ""
#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr ""
#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr ""
#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr ""
#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""